Mercurial > hg > mercurial-crew
changeset 28105:d39e743e3578
rebase: mention conflict in documentation instead of merge
author | timeless <timeless@mozdev.org> |
---|---|
date | Fri, 18 Dec 2015 18:32:15 +0000 |
parents | 97cc045f1cfe |
children | 2f15253e415f |
files | hgext/rebase.py |
diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/rebase.py +++ b/hgext/rebase.py @@ -138,7 +138,7 @@ a named branch with two heads. You will need to explicitly specify source and/or destination. - If a rebase is interrupted to manually resolve a merge, it can be + If a rebase is interrupted to manually resolve a conflict, it can be continued with --continue/-c or aborted with --abort/-a. .. container:: verbose