Mercurial > hg

comparison CONTRIBUTORS @ 27036:63d6bc874dea

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 ':local' merge tool This covers two of the four cases of change/delete conflicts -- in an upcoming patch we'll make :other cover the other two.
author Siddharth Agarwal <sid0@fb.com>
date Wed, 18 Nov 2015 15:40:28 -0800
parents c29efd272395
children
comparison
equal deleted inserted replaced
27035:de7bf242644e 27036:63d6bc874dea