Mercurial > hg
changeset 20871:e01cff65f4c5 stable
backout: document return code of merge conflict
| author | Yuya Nishihara <yuya@tcha.org> |
|---|---|
| date | Sat, 08 Mar 2014 18:41:56 +0900 |
| parents | 9658a79968c6 |
| children | 3f83fc5cfe71 |
| files | mercurial/commands.py |
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/commands.py Tue Apr 01 02:46:03 2014 +0900 +++ b/mercurial/commands.py Sat Mar 08 18:41:56 2014 +0900 @@ -416,7 +416,7 @@ See :hg:`help dates` for a list of formats valid for -d/--date. - Returns 0 on success. + Returns 0 on success, 1 if there are unresolved files. ''' if rev and node: raise util.Abort(_("please specify just one revision"))