Mercurial > hg

log mercurial/filemerge.py @ 24727:5668202cfaaf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
less more | (0) -30 -10 -7 tip
age author description
Thu, 19 Mar 2015 22:22:50 +0100 Mads Kiilerich merge: better debug messages before/after invoking external merge tool
Mon, 09 Feb 2015 23:07:39 -0800 Gregory Szorc help.merge-tools: do not double document merge tools
Sat, 08 Nov 2014 13:06:22 +0900 Yuya Nishihara util.system: use ui.system() in place of optional ui.fout parameter
Sun, 02 Nov 2014 14:58:50 -0500 Matt Harbison filemerge: split the logic for finding an external tool to its own function
Sun, 28 Sep 2014 17:15:28 +0200 Mads Kiilerich filemerge: switch the default name for internal tools from internal:x to :x
Sun, 28 Sep 2014 17:15:25 +0200 Mads Kiilerich filemerge: introduce :x as short version of internal:x merge tool name
Mon, 04 Aug 2014 16:32:41 -0700 Pierre-Yves David merge-tools: add a `premerge=keep-merge3` config option
less more | (0) -30 -10 -7 tip