Mercurial > hg

log mercurial/filemerge.py @ 26515:0ffa7fe1076b

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
Tue, 06 Oct 2015 22:56:33 -0700 Siddharth Agarwal filemerge: add a precheck for symlinks
Tue, 06 Oct 2015 22:55:21 -0700 Siddharth Agarwal filemerge: call precheck if available
Tue, 06 Oct 2015 22:54:14 -0700 Siddharth Agarwal filemerge: add a before-merge callback to internal merge tools
Tue, 06 Oct 2015 17:39:13 -0700 Siddharth Agarwal filemerge: indent filemerge.filemerge
Thu, 10 Sep 2015 09:41:11 -0400 Jordi Gutiérrez Hermoso filemerge: add non-interactive :merge-local and :merge-other
Sun, 16 Aug 2015 10:19:00 +0200 Erik Huelsmann filemerge: add 'union' merge to internal merge tool
Sun, 16 Aug 2015 00:24:29 +0200 Erik Huelsmann filemerge: split internal merge into api entry point and internal helper
less more | (0) -100 -30 -10 -7 tip