##// END OF EJS Templates
merge: document how to 'undo' a merge
Matt Mackall -
r11452:eac14140 stable
parent child Browse files
Show More
@@ -2570,6 +2570,10 b' def merge(ui, repo, node=None, **opts):'
2570 head, the other head is merged with by default. Otherwise, an
2570 head, the other head is merged with by default. Otherwise, an
2571 explicit revision with which to merge with must be provided.
2571 explicit revision with which to merge with must be provided.
2572
2572
2573 To undo an uncommitted merge, use :hg:`update --clean .` which
2574 will check out a clean copy of the original merge parent, losing
2575 all changes.
2576
2573 Returns 0 on success, 1 if there are unresolved files.
2577 Returns 0 on success, 1 if there are unresolved files.
2574 """
2578 """
2575
2579
General Comments 0
You need to be logged in to leave comments. Login now