equal
deleted
inserted
replaced
43 1a -> 1 * |
43 1a -> 1 * |
44 checking for directory renames |
44 checking for directory renames |
45 1: remote moved to 1a -> m |
45 1: remote moved to 1a -> m |
46 copying 1 to 1a |
46 copying 1 to 1a |
47 merging 1 and 1a |
47 merging 1 and 1a |
48 my 1@746e9549ea96+ other 1a@2f8037f47a5c ancestor 1@81f4b099af3d |
48 my 1@746e9549ea96+ other 1a@ac7575e3c052 ancestor 1@81f4b099af3d |
49 removing 1 |
49 removing 1 |
50 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
50 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
51 (branch merge, don't forget to commit) |
51 (branch merge, don't forget to commit) |