2006-05-02 20:44:02 +04:00
|
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
2007-04-17 03:17:39 +04:00
|
|
|
warning: conflicts during merge.
|
2005-06-15 12:27:20 +04:00
|
|
|
merging a
|
|
|
|
merging a failed!
|
2006-05-02 20:44:02 +04:00
|
|
|
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
|
|
|
|
There are unresolved merges, you can redo the full merge using:
|
|
|
|
hg update -C 2
|
|
|
|
hg merge 1
|
2006-03-13 15:05:41 +03:00
|
|
|
e7fe8eb3e180+0d24b7662d3e+ tip
|
2007-04-29 00:55:45 +04:00
|
|
|
<<<<<<< my
|
2005-06-15 12:27:20 +04:00
|
|
|
something else
|
|
|
|
=======
|
|
|
|
something
|
2007-04-29 00:55:45 +04:00
|
|
|
>>>>>>> other
|
2005-07-21 21:40:28 +04:00
|
|
|
M a
|