equal
deleted
inserted
replaced
41 changeset: 0:33aaa84a386b |
41 changeset: 0:33aaa84a386b |
42 user: test |
42 user: test |
43 date: Mon Jan 12 13:46:40 1970 +0000 |
43 date: Mon Jan 12 13:46:40 1970 +0000 |
44 summary: 1 |
44 summary: 1 |
45 |
45 |
46 abort: there is nothing to merge, just use 'hg update' or look at 'hg heads' |
46 abort: there is nothing to merge - use "hg update" instead |
47 failed |
47 failed |
48 changeset: 0:33aaa84a386b |
48 changeset: 0:33aaa84a386b |
49 user: test |
49 user: test |
50 date: Mon Jan 12 13:46:40 1970 +0000 |
50 date: Mon Jan 12 13:46:40 1970 +0000 |
51 summary: 1 |
51 summary: 1 |