Mercurial > public > mercurial-scm > hg

comparison mercurial/commands.py @ 20871:e01cff65f4c5 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
backout: document return code of merge conflict
author Yuya Nishihara <yuya@tcha.org>
date Sat, 08 Mar 2014 18:41:56 +0900
parents 5db105f216c3
children 3f83fc5cfe71
comparison
equal deleted inserted replaced
20869:9658a79968c6 20871:e01cff65f4c5
414 cancel the merge and leave the child of REV as a head to be 414 cancel the merge and leave the child of REV as a head to be
415 merged separately. 415 merged separately.
416 416
417 See :hg:`help dates` for a list of formats valid for -d/--date. 417 See :hg:`help dates` for a list of formats valid for -d/--date.
418 418
419 Returns 0 on success. 419 Returns 0 on success, 1 if there are unresolved files.
420 ''' 420 '''
421 if rev and node: 421 if rev and node:
422 raise util.Abort(_("please specify just one revision")) 422 raise util.Abort(_("please specify just one revision"))
423 423
424 if not rev: 424 if not rev: