Mercurial > hg

diff mercurial/default.d/mergetools.rc @ 27034:86ede9eda252

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
filemerge: return whether the file was deleted This is required for change/delete conflict resolution -- see previous patches for more details.
author Siddharth Agarwal <sid0@fb.com>
date Wed, 18 Nov 2015 14:22:52 -0800
parents f6e2e42fb8ef
children a9802c9ecfb5
line wrap: on
line diff