Mercurial > hg

comparison mercurial/tagmerge.py @ 27652:cc91f3bc5461

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
_checkunknownfiles: rename 'aborts' to 'conflicts' In upcoming patches we'll be able to do more useful things than aborting.
author Siddharth Agarwal <sid0@fb.com>
date Sat, 02 Jan 2016 03:02:57 -0800
parents fa91c49a9b9f
children 5d92107dfb9b
comparison
equal deleted inserted replaced
27651:07fc2f2134ba 27652:cc91f3bc5461