equal
deleted
inserted
replaced
57 hg commit -t "commit #2" -d "0 0" -u user |
57 hg commit -t "commit #2" -d "0 0" -u user |
58 hg update 1 |
58 hg update 1 |
59 echo This is file c1 > c |
59 echo This is file c1 > c |
60 hg add c |
60 hg add c |
61 hg commit -t "commit #3" -d "0 0" -u user |
61 hg commit -t "commit #3" -d "0 0" -u user |
|
62 cat b |
62 echo This is file b22 > b |
63 echo This is file b22 > b |
63 env HGMERGE=../merge hg update -m 2 |
64 env HGMERGE=../merge hg update -m 2 |
64 # no merges expected |
65 # merge expected! |
65 cd ..; /bin/rm -rf t |
66 cd ..; /bin/rm -rf t |
66 |
67 |
67 mkdir t |
68 mkdir t |
68 cd t |
69 cd t |
69 hg init |
70 hg init |