|
1 pulling from /tmp/hgtests.12359.29374.16319.16463/test-merge7/test-a |
|
2 searching for changes |
|
3 adding changesets |
|
4 adding manifests |
|
5 adding file changes |
|
6 added 1 changesets with 1 changes to 1 files (+1 heads) |
|
7 (run 'hg update' to get a working copy) |
|
8 merge: warning: conflicts during merge |
|
9 merging test.txt |
|
10 merging test.txt failed! |
|
11 pulling from /tmp/hgtests.12359.29374.16319.16463/test-merge7/test-a |
|
12 searching for changes |
|
13 adding changesets |
|
14 adding manifests |
|
15 adding file changes |
|
16 added 1 changesets with 1 changes to 1 files (+1 heads) |
|
17 (run 'hg update' to get a working copy) |
|
18 merge: warning: conflicts during merge |
|
19 resolving manifests |
|
20 force None allow 1 moddirstate True linear False |
|
21 ancestor 055d847dd401 local 2eded9ab0a5c remote 84cf5750dd20 |
|
22 test.txt versions differ, resolve |
|
23 merging test.txt |
|
24 resolving test.txt |
|
25 file test.txt: my fc3148072371 other d40249267ae3 ancestor 8fe46a3eb557 |
|
26 merging test.txt failed! |
|
27 one |
|
28 <<<<<<< /tmp/hgtests.12359.29374.16319.16463/test-merge7/test-b/test.txt |
|
29 two-point-five |
|
30 ======= |
|
31 two-point-one |
|
32 >>>>>>> /tmp/test.txt~other.bN33Pl |
|
33 three |
|
34 rev offset length base linkrev nodeid p1 p2 |
|
35 0 0 7 0 0 01365c4cca56 000000000000 000000000000 |
|
36 1 7 9 1 1 7b013192566a 01365c4cca56 000000000000 |
|
37 2 16 15 2 2 8fe46a3eb557 01365c4cca56 000000000000 |
|
38 3 31 27 2 3 fc3148072371 7b013192566a 8fe46a3eb557 |
|
39 4 58 25 4 4 d40249267ae3 8fe46a3eb557 000000000000 |
|
40 changeset: 4:50aec39675ea |
|
41 tag: tip |
|
42 parent: 2:96b70246a118 |
|
43 user: test |
|
44 date: Mon Sep 26 23:50:15 2005 +0000 |
|
45 summary: two -> two-point-one |
|
46 |
|
47 changeset: 3:50c3a7e29886 |
|
48 parent: 1:d1e159716d41 |
|
49 parent: 2:96b70246a118 |
|
50 user: test |
|
51 date: Thu Jan 1 00:00:00 1970 +0000 |
|
52 summary: Merge 1 |
|
53 |
|
54 changeset: 2:96b70246a118 |
|
55 parent: 0:b1832b9d912a |
|
56 user: test |
|
57 date: Thu Jan 1 00:00:00 1970 +0000 |
|
58 summary: Numbers as words |
|
59 |
|
60 changeset: 1:d1e159716d41 |
|
61 user: test |
|
62 date: Thu Jan 1 00:00:00 1970 +0000 |
|
63 summary: 2 -> 2.5 |
|
64 |
|
65 changeset: 0:b1832b9d912a |
|
66 user: test |
|
67 date: Thu Jan 1 00:00:00 1970 +0000 |
|
68 summary: Initial |
|
69 |