equal
deleted
inserted
replaced
46 update: b 1/2 files (50.00%) |
46 update: b 1/2 files (50.00%) |
47 removing b |
47 removing b |
48 update: a 2/2 files (100.00%) |
48 update: a 2/2 files (100.00%) |
49 picked tool 'true' for a (binary False symlink False) |
49 picked tool 'true' for a (binary False symlink False) |
50 merging a |
50 merging a |
51 my a@802f095af299+ other a@33aaa84a386b ancestor a@33aaa84a386b |
51 my a@802f095af299+ other a@33aaa84a386b ancestor a@802f095af299 |
52 premerge successful |
|
53 0 files updated, 1 files merged, 1 files removed, 0 files unresolved |
52 0 files updated, 1 files merged, 1 files removed, 0 files unresolved |
54 changeset: 0:33aaa84a386b |
53 changeset: 0:33aaa84a386b |
55 user: test |
54 user: test |
56 date: Mon Jan 12 13:46:40 1970 +0000 |
55 date: Mon Jan 12 13:46:40 1970 +0000 |
57 summary: 1 |
56 summary: 1 |