| 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
|
| Sat, 08 Aug 2015 19:15:09 -0700 |
Gregory Szorc |
filemerge: use absolute_import
|
| Thu, 25 Jun 2015 17:46:55 -0500 |
Matt Mackall |
filemerge: mark internal-only config option
|
| Mon, 04 May 2015 10:01:03 +0900 |
Yuya Nishihara |
templater: remove noop calls of parsestring(s, quoted=False) (API)
|
| 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
|
