Mercurial > hg

diff mercurial/byterange.py @ 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 3aa34005a73d
children 7de7630053cb
line wrap: on
line diff