| 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
|