Mercurial > hg

diff mercurial/branchmap.py @ 27037:a8908c139f2f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
filemerge: add support for change/delete conflicts to the ':other' merge tool This, along with the previous patch to the :local merge tool, covers the full matrix of change/delete conflicts.
author Siddharth Agarwal <sid0@fb.com>
date Wed, 18 Nov 2015 15:41:50 -0800
parents 56b2bcea2529
children f1460af18c50
line wrap: on
line diff