equal
deleted
inserted
replaced
494 to specifying --merge followed by :hg:`update --clean .` to |
494 to specifying --merge followed by :hg:`update --clean .` to |
495 cancel the merge and leave the child of REV as a head to be |
495 cancel the merge and leave the child of REV as a head to be |
496 merged separately. |
496 merged separately. |
497 |
497 |
498 See :hg:`help dates` for a list of formats valid for -d/--date. |
498 See :hg:`help dates` for a list of formats valid for -d/--date. |
|
499 |
|
500 See :hg:`help revert` for a way to restore files to the state |
|
501 of another revision. |
499 |
502 |
500 Returns 0 on success, 1 if nothing to backout or there are unresolved |
503 Returns 0 on success, 1 if nothing to backout or there are unresolved |
501 files. |
504 files. |
502 ''' |
505 ''' |
503 if rev and node: |
506 if rev and node: |