Mercurial > public > mercurial-scm > hg

log mercurial/filemerge.py @ 27039:d7517deedf86

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
less more | (0) -100 -30 -10 -7 tip
age author description
Sun, 15 Nov 2015 21:40:15 -0800 Siddharth Agarwal filemerge._picktool: only pick from nomerge tools for change/delete conflicts
Fri, 13 Nov 2015 23:52:26 -0800 Siddharth Agarwal filemerge: add support for change/delete conflicts to the ':prompt' tool
Wed, 18 Nov 2015 15:41:50 -0800 Siddharth Agarwal filemerge: add support for change/delete conflicts to the ':other' merge tool
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
Wed, 18 Nov 2015 13:55:31 -0800 Siddharth Agarwal filemerge: return whether the file is deleted from all other merge tools
Wed, 18 Nov 2015 13:52:28 -0800 Siddharth Agarwal filemerge: return whether the file is deleted for nomerge internal tools
less more | (0) -100 -30 -10 -7 tip