| Wed, 07 Oct 2015 23:35:30 -0700 |
Siddharth Agarwal |
filemerge: move post-merge checks into a separate function
|
file |
diff |
annotate
|
| Thu, 08 Oct 2015 14:18:43 -0700 |
Siddharth Agarwal |
filemerge._xmerge: drop no longer necessary 'if r:' check
|
file |
diff |
annotate
|
| Thu, 08 Oct 2015 14:17:31 -0700 |
Siddharth Agarwal |
filemerge._idump: drop no longer necessary 'if r:' check
|
file |
diff |
annotate
|
| Thu, 08 Oct 2015 14:16:19 -0700 |
Siddharth Agarwal |
filemerge._merge: drop no longer necessary 'if r:' check
|
file |
diff |
annotate
|
| Wed, 07 Oct 2015 21:22:16 -0700 |
Siddharth Agarwal |
filemerge: call premerge directly from main merge function
|
file |
diff |
annotate
|
| Wed, 07 Oct 2015 21:28:43 -0700 |
Siddharth Agarwal |
filemerge: move precheck to before files are written out
|
file |
diff |
annotate
|
| Wed, 07 Oct 2015 22:58:52 -0700 |
Siddharth Agarwal |
filemerge: move 'merging' output to before file creation
|
file |
diff |
annotate
|
| Wed, 07 Oct 2015 21:21:56 -0700 |
Siddharth Agarwal |
filemerge.filemerge: make a tuple containing merge paths on disk
|
file |
diff |
annotate
|
| Wed, 07 Oct 2015 16:14:57 -0700 |
Siddharth Agarwal |
filemerge: switch trymerge boolean to mergetype enum
|
file |
diff |
annotate
|
| Wed, 07 Oct 2015 15:13:41 -0700 |
Siddharth Agarwal |
filemerge: add some merge types
|
file |
diff |
annotate
|
| Wed, 07 Oct 2015 00:27:23 -0700 |
Siddharth Agarwal |
filemerge: run symlink check for :merge3
|
file |
diff |
annotate
|
| Wed, 07 Oct 2015 00:24:44 -0700 |
Siddharth Agarwal |
filemerge: print correct name of tool for symlink checks
|
file |
diff |
annotate
|
| Wed, 07 Oct 2015 00:01:16 -0700 |
Siddharth Agarwal |
filemerge: normalize 'internal:foo' names to ':foo'
|
file |
diff |
annotate
|
| Tue, 06 Oct 2015 22:57:21 -0700 |
Siddharth Agarwal |
filemerge: use symlinkcheck for :merge and :union
|
file |
diff |
annotate
|
| Tue, 06 Oct 2015 22:56:33 -0700 |
Siddharth Agarwal |
filemerge: add a precheck for symlinks
|
file |
diff |
annotate
|
| Tue, 06 Oct 2015 22:55:21 -0700 |
Siddharth Agarwal |
filemerge: call precheck if available
|
file |
diff |
annotate
|
| Tue, 06 Oct 2015 22:54:14 -0700 |
Siddharth Agarwal |
filemerge: add a before-merge callback to internal merge tools
|
file |
diff |
annotate
|
| Tue, 06 Oct 2015 17:39:13 -0700 |
Siddharth Agarwal |
filemerge: indent filemerge.filemerge
|
file |
diff |
annotate
|
| Thu, 10 Sep 2015 09:41:11 -0400 |
Jordi Gutiérrez Hermoso |
filemerge: add non-interactive :merge-local and :merge-other
|
file |
diff |
annotate
|
| Sun, 16 Aug 2015 10:19:00 +0200 |
Erik Huelsmann |
filemerge: add 'union' merge to internal merge tool
|
file |
diff |
annotate
|
| Sun, 16 Aug 2015 00:24:29 +0200 |
Erik Huelsmann |
filemerge: split internal merge into api entry point and internal helper
|
file |
diff |
annotate
|
| Sat, 08 Aug 2015 19:15:09 -0700 |
Gregory Szorc |
filemerge: use absolute_import
|
file |
diff |
annotate
|
| Thu, 25 Jun 2015 17:46:55 -0500 |
Matt Mackall |
filemerge: mark internal-only config option
|
file |
diff |
annotate
|
| Mon, 04 May 2015 10:01:03 +0900 |
Yuya Nishihara |
templater: remove noop calls of parsestring(s, quoted=False) (API)
|
file |
diff |
annotate
|
| Thu, 19 Mar 2015 22:22:50 +0100 |
Mads Kiilerich |
merge: better debug messages before/after invoking external merge tool
|
file |
diff |
annotate
|
| Mon, 09 Feb 2015 23:07:39 -0800 |
Gregory Szorc |
help.merge-tools: do not double document merge tools
|
file |
diff |
annotate
|
| Sat, 08 Nov 2014 13:06:22 +0900 |
Yuya Nishihara |
util.system: use ui.system() in place of optional ui.fout parameter
|
file |
diff |
annotate
|
| Sun, 02 Nov 2014 14:58:50 -0500 |
Matt Harbison |
filemerge: split the logic for finding an external tool to its own function
|
file |
diff |
annotate
|
| Sun, 28 Sep 2014 17:15:28 +0200 |
Mads Kiilerich |
filemerge: switch the default name for internal tools from internal:x to :x
|
file |
diff |
annotate
|
| Sun, 28 Sep 2014 17:15:25 +0200 |
Mads Kiilerich |
filemerge: introduce :x as short version of internal:x merge tool name
|
file |
diff |
annotate
|
| Mon, 04 Aug 2014 16:32:41 -0700 |
Pierre-Yves David |
merge-tools: add a `premerge=keep-merge3` config option
|
file |
diff |
annotate
|
| Mon, 04 Aug 2014 16:58:39 -0700 |
Pierre-Yves David |
merge-tools: make premerge valid values extensible
|
file |
diff |
annotate
|
| Tue, 05 Aug 2014 14:58:45 -0700 |
Pierre-Yves David |
merge: add an internal:merge3 tool
|
file |
diff |
annotate
|
| Tue, 05 Aug 2014 15:09:54 -0700 |
Pierre-Yves David |
internal:merge: update documentation
|
file |
diff |
annotate
|
| Tue, 05 Aug 2014 15:17:38 -0700 |
Pierre-Yves David |
filemerge: allow the formatting of three labels instead of two
|
file |
diff |
annotate
|
| Tue, 05 Aug 2014 15:12:22 -0700 |
Pierre-Yves David |
filemerge: drop extra white space
|
file |
diff |
annotate
|
| Tue, 05 Aug 2014 14:56:25 -0700 |
Pierre-Yves David |
simplemerge: burn "minimal" feature to the ground
|
file |
diff |
annotate
|
| Tue, 29 Jul 2014 11:55:01 -0700 |
Pierre-Yves David |
merge: use no-minimal for premerge too
|
file |
diff |
annotate
|
| Mon, 09 Jun 2014 23:37:36 -0700 |
Pierre-Yves David |
merge: refactor labels selection code
|
file |
diff |
annotate
|
| Thu, 26 Jun 2014 01:20:25 +0200 |
Angel Ezquerra |
filemerge: add internal:tagmerge merge tool
|
file |
diff |
annotate
|
| Fri, 18 Jul 2014 21:49:52 -0500 |
Matt Mackall |
filemerge: use non-minimal conflict marker regions (BC)
|
file |
diff |
annotate
|
| Sun, 06 Jul 2014 02:56:41 +0900 |
FUJIWARA Katsunori |
filemerge: use 'basic' as the default of '[ui] mergemarkers' for safety
|
file |
diff |
annotate
|
| Sun, 06 Jul 2014 02:56:41 +0900 |
FUJIWARA Katsunori |
filemerge: use 'util.ellipsis' to trim custom conflict markers correctly
|
file |
diff |
annotate
|
| Sun, 06 Jul 2014 02:56:41 +0900 |
FUJIWARA Katsunori |
filemerge: use only the first line of the generated conflict marker for safety
|
file |
diff |
annotate
|
| Mon, 26 May 2014 11:44:58 -0700 |
Pierre-Yves David |
merge: drop the quotes around commit description
|
file |
diff |
annotate
|
| Thu, 08 May 2014 16:54:23 -0700 |
Durham Goode |
merge: add labels parameter from merge.update to filemerge
|
file |
diff |
annotate
|
| Thu, 08 May 2014 16:50:22 -0700 |
Durham Goode |
merge: add conflict marker formatter (BC)
|
file |
diff |
annotate
|
| Thu, 08 May 2014 16:37:33 -0700 |
Durham Goode |
merge: define conflict marker labels in filemerge()
|
file |
diff |
annotate
|
| Thu, 17 Apr 2014 14:54:46 +0200 |
Mads Kiilerich |
filemerge: better handling of failing remove of temporary files
|
file |
diff |
annotate
|
| Wed, 12 Mar 2014 13:15:09 -0400 |
Augie Fackler |
filemerge: move from dict() construction to {} literals
|
file |
diff |
annotate
|
| Wed, 22 May 2013 17:31:43 -0500 |
Matt Mackall |
ui: merge prompt text components into a singe string
|
file |
diff |
annotate
|
| Tue, 15 Jan 2013 01:05:11 +0100 |
Mads Kiilerich |
merge: warn when internal:merge cannot merge symlinks
|
file |
diff |
annotate
|
| Tue, 08 Jan 2013 04:15:46 +0100 |
Mads Kiilerich |
merge: never do premerge on symlinks
|
file |
diff |
annotate
|
| Tue, 08 Jan 2013 04:15:41 +0100 |
Mads Kiilerich |
merge: make internal merge fail cleanly on symlinks
|
file |
diff |
annotate
|
| Fri, 26 Oct 2012 12:02:58 -0700 |
Keegan Carruthers-Smith |
filemerge: use util.shellquote when calling merge (issue3581)
stable
|
file |
diff |
annotate
|
| Tue, 13 Mar 2012 16:29:13 -0500 |
Matt Mackall |
merge with stable
|
file |
diff |
annotate
|
| Tue, 13 Mar 2012 15:12:26 -0500 |
Matt Mackall |
filemerge: restore default prompt for binary/symlink lost in 83925d3a4559
stable
|
file |
diff |
annotate
|
| Thu, 01 Mar 2012 17:45:13 +0100 |
Thomas Arendsen Hein |
merge with stable
|
file |
diff |
annotate
|
| Thu, 01 Mar 2012 17:35:12 +0100 |
Thomas Arendsen Hein |
filemerge: remove temporary files when using internal:dump as merge-tool
stable
|
file |
diff |
annotate
|
| Thu, 16 Feb 2012 15:58:51 -0600 |
Matt Mackall |
filemerge: remove some redundancy in decorators/docstrings
|
file |
diff |
annotate
|