Mercurial > hg
changeset 11452:eac141407b85 stable
merge: document how to 'undo' a merge
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Sun, 27 Jun 2010 17:41:43 -0500 |
| parents | 51021f4c80b5 |
| children | 2ee26044d846 |
| files | mercurial/commands.py |
| diffstat | 1 files changed, 4 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/commands.py Sun Jun 27 23:12:05 2010 +0200 +++ b/mercurial/commands.py Sun Jun 27 17:41:43 2010 -0500 @@ -2570,6 +2570,10 @@ head, the other head is merged with by default. Otherwise, an explicit revision with which to merge with must be provided. + To undo an uncommitted merge, use :hg:`update --clean .` which + will check out a clean copy of the original merge parent, losing + all changes. + Returns 0 on success, 1 if there are unresolved files. """