Mercurial > hg

comparison mercurial/tagmerge.py @ 27041:0e330f59ef68

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
filemerge: don't attempt to premerge change/delete conflicts This is mostly for completeness' sake -- at the moment we don't support any tools for change/delete conflicts that would do a premerge.
author Siddharth Agarwal <sid0@fb.com>
date Fri, 13 Nov 2015 23:56:00 -0800
parents fa91c49a9b9f
children 5d92107dfb9b
comparison
equal deleted inserted replaced
27040:1bde66b89bb2 27041:0e330f59ef68