Mercurial > hg-stable

comparison mercurial/tagmerge.py @ 27741:3951f132958f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: determine what untracked conflicts cause warns and aborts separately This is written in a somewhat weird style, but it's designed for code reuse in an upcoming patch.
author Siddharth Agarwal <sid0@fb.com>
date Tue, 12 Jan 2016 18:17:07 -0800
parents fa91c49a9b9f
children 5d92107dfb9b
comparison
equal deleted inserted replaced
27740:da5634e1b8a3 27741:3951f132958f