Mercurial > public > mercurial-scm > hg

log mercurial/filemerge.py @ 27036:63d6bc874dea

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
less more | (0) -100 -30 -10 -2 tip
age author description
Wed, 18 Nov 2015 15:40:28 -0800 Siddharth Agarwal filemerge: add support for change/delete conflicts to the ':local' merge tool
Wed, 18 Nov 2015 14:22:52 -0800 Siddharth Agarwal filemerge: return whether the file was deleted
less more | (0) -100 -30 -10 -2 tip