Mercurial > hg-stable
changeset 15209:10f85a735601
backout: mark some help verbose
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Sat, 08 Oct 2011 13:23:57 -0500 |
| parents | d0694223861a |
| children | 9d8115c5fbda |
| files | mercurial/commands.py |
| diffstat | 1 files changed, 11 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/commands.py Fri Oct 07 17:22:12 2011 -0500 +++ b/mercurial/commands.py Sat Oct 08 13:23:57 2011 -0500 @@ -378,15 +378,17 @@ is committed automatically. Otherwise, hg needs to merge the changes and the merged result is left uncommitted. - By default, the pending changeset will have one parent, - maintaining a linear history. With --merge, the pending changeset - will instead have two parents: the old parent of the working - directory and a new child of REV that simply undoes REV. - - Before version 1.7, the behavior without --merge was equivalent to - specifying --merge followed by :hg:`update --clean .` to cancel - the merge and leave the child of REV as a head to be merged - separately. + .. container:: verbose + + By default, the pending changeset will have one parent, + maintaining a linear history. With --merge, the pending + changeset will instead have two parents: the old parent of the + working directory and a new child of REV that simply undoes REV. + + Before version 1.7, the behavior without --merge was equivalent + to specifying --merge followed by :hg:`update --clean .` to + cancel the merge and leave the child of REV as a head to be + merged separately. See :hg:`help dates` for a list of formats valid for -d/--date.