equal
deleted
inserted
replaced
49 + hg commit -t 'commit #2' -d '0 0' -u user |
49 + hg commit -t 'commit #2' -d '0 0' -u user |
50 + hg update 1 |
50 + hg update 1 |
51 + echo This is file c1 |
51 + echo This is file c1 |
52 + hg add c |
52 + hg add c |
53 + hg commit -t 'commit #3' -d '0 0' -u user |
53 + hg commit -t 'commit #3' -d '0 0' -u user |
|
54 + cat b |
|
55 This is file b1 |
54 + echo This is file b22 |
56 + echo This is file b22 |
55 + env HGMERGE=../merge hg update -m 2 |
57 + env HGMERGE=../merge hg update -m 2 |
|
58 merging for b |
|
59 merging b |
56 + cd .. |
60 + cd .. |
57 + /bin/rm -rf t |
61 + /bin/rm -rf t |
58 + mkdir t |
62 + mkdir t |
59 + cd t |
63 + cd t |
60 + hg init |
64 + hg init |