equal
deleted
inserted
replaced
2 searching for changes |
2 searching for changes |
3 adding changesets |
3 adding changesets |
4 adding manifests |
4 adding manifests |
5 adding file changes |
5 adding file changes |
6 added 1 changesets with 1 changes to 1 files (+1 heads) |
6 added 1 changesets with 1 changes to 1 files (+1 heads) |
7 (run 'hg update' to get a working copy) |
7 (run 'hg heads' to see heads, 'hg merge' to merge) |
8 merge: warning: conflicts during merge |
8 merge: warning: conflicts during merge |
9 merging test.txt |
9 merging test.txt |
10 merging test.txt failed! |
10 merging test.txt failed! |
11 pulling from ../test-a |
11 pulling from ../test-a |
12 searching for changes |
12 searching for changes |
13 adding changesets |
13 adding changesets |
14 adding manifests |
14 adding manifests |
15 adding file changes |
15 adding file changes |
16 added 1 changesets with 1 changes to 1 files (+1 heads) |
16 added 1 changesets with 1 changes to 1 files (+1 heads) |
17 (run 'hg update' to get a working copy) |
17 (run 'hg heads' to see heads, 'hg merge' to merge) |
18 merge: warning: conflicts during merge |
18 merge: warning: conflicts during merge |
19 resolving manifests |
19 resolving manifests |
20 force None allow 1 moddirstate True linear False |
20 force None allow 1 moddirstate True linear False |
21 ancestor 055d847dd401 local 2eded9ab0a5c remote 84cf5750dd20 |
21 ancestor 055d847dd401 local 2eded9ab0a5c remote 84cf5750dd20 |
22 test.txt versions differ, resolve |
22 test.txt versions differ, resolve |