author | Matt Mackall <mpm@selenic.com> |
Thu, 30 Nov 2006 19:50:28 -0600 | |
changeset 3735 | 205f0fd4a4a1 |
parent 3734 | 216e75c721d3 |
child 3748 | 7b88bd88f040 |
permissions | -rwxr-xr-x |
#!/bin/sh mkdir t cd t hg init mkdir a echo foo > a/a echo bar > a/b hg add a hg ci -m "0" -d "0 0" hg co -C 0 hg mv a b hg ci -m "1 mv a/ b/" -d "0 0" hg co -C 0 echo baz > a/c hg add a/c hg ci -m "2 add a/c" -d "0 0" hg merge --debug 1 ls a/ b/ hg st -C hg ci -m "3 merge 2+1" -d "0 0" hg co -C 1 hg merge --debug 2 ls a/ b/ hg st -C hg ci -m "4 merge 1+2" -d "0 0"