Mercurial > hg
comparison mercurial/commands.py @ 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 | ee1ed6afac21 |
| children | 59af1d65029c |
comparison
equal
deleted
inserted
replaced
| 11451:51021f4c80b5 | 11452:eac141407b85 |
|---|---|
| 2567 | 2567 |
| 2568 If no revision is specified, the working directory's parent is a | 2568 If no revision is specified, the working directory's parent is a |
| 2569 head revision, and the current branch contains exactly one other | 2569 head revision, and the current branch contains exactly one other |
| 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 | |
| 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. | |
| 2572 | 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 |
| 2576 if opts.get('rev') and node: | 2580 if opts.get('rev') and node: |