equal
deleted
inserted
replaced
36 summary: 2 |
36 summary: 2 |
37 |
37 |
38 resolving manifests |
38 resolving manifests |
39 overwrite False partial False |
39 overwrite False partial False |
40 ancestor 33aaa84a386b local 802f095af299+ remote 33aaa84a386b |
40 ancestor 33aaa84a386b local 802f095af299+ remote 33aaa84a386b |
|
41 a: versions differ -> m |
41 b: other deleted -> r |
42 b: other deleted -> r |
|
43 preserving a for resolve of a |
42 removing b |
44 removing b |
43 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
45 picked tool 'true' for a (binary False symlink False) |
|
46 merging a |
|
47 my a@802f095af299+ other a@33aaa84a386b ancestor a@33aaa84a386b |
|
48 premerge successful |
|
49 0 files updated, 1 files merged, 1 files removed, 0 files unresolved |
44 changeset: 0:33aaa84a386b |
50 changeset: 0:33aaa84a386b |
45 user: test |
51 user: test |
46 date: Mon Jan 12 13:46:40 1970 +0000 |
52 date: Mon Jan 12 13:46:40 1970 +0000 |
47 summary: 1 |
53 summary: 1 |
48 |
54 |