Mercurial > hg

comparison hgeditor @ 15619:6c8573dd1b6b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: make 'nothing to merge' aborts consistent Makes the 'nothing to merge' abort messages in commands.py consistent with those in merge.py. Also makes commands.merge() and merge.update() use hints. The tests show the changes.
author Kevin Bullock <kbullock@ringworld.org>
date Wed, 07 Dec 2011 11:23:01 -0600
parents 2b440bb8a66b
children 1aee2ab0f902
comparison
equal deleted inserted replaced
15618:0aca2695a110 15619:6c8573dd1b6b