Mercurial > public > mercurial-scm > hg-stable

log mercurial/filemerge.py @ 26957:d16d73173fdd

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
Wed, 11 Nov 2015 17:34:28 -0800 Siddharth Agarwal filemerge: rename _symlinkcheck to _mergecheck
Tue, 10 Nov 2015 16:25:59 -0800 Christian Delahousse filemerge: choose where .orig files are kept
Tue, 10 Nov 2015 17:13:16 -0800 Siddharth Agarwal filemerge: treat EOF at prompt as fail, not abort
Sun, 08 Nov 2015 23:42:44 -0800 Siddharth Agarwal filemerge: move :merge-local/other symlink check to precheck
Mon, 02 Nov 2015 12:12:24 -0800 Siddharth Agarwal filemerge.prompt: separate out choice selection and action
Wed, 14 Oct 2015 12:57:33 -0400 Augie Fackler merge-tools: allow marking a mergetool as completely disabled
Fri, 09 Oct 2015 13:54:52 -0700 Siddharth Agarwal simplemerge: move conflict warning message to filemerge
less more | (0) -100 -30 -10 -7 tip