| Wed, 14 Oct 2015 12:57:33 -0400 |
Augie Fackler |
merge-tools: allow marking a mergetool as completely disabled
|
file |
diff |
annotate
|
| Fri, 09 Oct 2015 13:54:52 -0700 |
Siddharth Agarwal |
simplemerge: move conflict warning message to filemerge
|
file |
diff |
annotate
|
| Sun, 11 Oct 2015 20:47:14 -0700 |
Siddharth Agarwal |
filemerge: break overall filemerge into separate premerge and merge steps
|
file |
diff |
annotate
|
| Wed, 02 Sep 2015 16:56:04 -0400 |
timeless |
test-merge-tools: include /usr/sbin in path for sysctl (issue4813)
|
file |
diff |
annotate
|
| Wed, 08 Jul 2015 17:01:09 +0900 |
FUJIWARA Katsunori |
context: write dirstate out explicitly after marking files as clean
|
file |
diff |
annotate
|
| Fri, 24 Apr 2015 23:52:41 +0900 |
FUJIWARA Katsunori |
revert: apply normallookup on reverted file if size isn't changed (issue4583)
stable
|
file |
diff |
annotate
|
| Fri, 17 Apr 2015 15:42:20 -0500 |
Matt Mackall |
tests: fix portability issue with test-merge-tools
stable
|
file |
diff |
annotate
|
| Tue, 10 Feb 2015 16:17:15 -0800 |
Martin von Zweigbergk |
test-merge-tools: fix flaky test by avoiding debugsetparents
|
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:50:15 -0700 |
Pierre-Yves David |
mergetools: add a test for premerge --keep
|
file |
diff |
annotate
|
| Mon, 04 Aug 2014 16:39:47 -0700 |
Pierre-Yves David |
test-merge-tools: introduce a "revision 4" that merges with conflict
|
file |
diff |
annotate
|
| Mon, 26 May 2014 11:44:58 -0700 |
Pierre-Yves David |
merge: drop the quotes around commit description
|
file |
diff |
annotate
|
| Mon, 19 May 2014 01:53:34 +0200 |
Mads Kiilerich |
update: introduce --tool for controlling the merge tool
|
file |
diff |
annotate
|
| Thu, 08 May 2014 16:50:22 -0700 |
Durham Goode |
merge: add conflict marker formatter (BC)
|
file |
diff |
annotate
|
| Sun, 02 Jun 2013 15:27:08 -0500 |
Matt Mackall |
tests: avoid writing files to HGTMP
|
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:41 +0100 |
Mads Kiilerich |
merge: make internal merge fail cleanly on symlinks
|
file |
diff |
annotate
|
| Thu, 01 Nov 2012 14:59:55 -0500 |
Matt Mackall |
tests: fix test for issue3581 for vfat on Linux
stable 2.4
|
file |
diff |
annotate
|
| Tue, 30 Oct 2012 17:23:51 -0700 |
Keegan Carruthers-Smith |
filemerge: only run test for issue3581 on non-windows environments
stable
|
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
|
| Fri, 17 Aug 2012 13:58:18 -0700 |
timeless |
spelling: nonexistent
|
file |
diff |
annotate
|
| Fri, 15 Jun 2012 00:02:27 +0200 |
Mads Kiilerich |
tests: add some missing #if's / hghave requirements
|
file |
diff |
annotate
|
| Fri, 15 Jun 2012 17:32:33 +0200 |
Adrian Buehlmann |
test-merge-tools: adapt for Windows
|
file |
diff |
annotate
|
| Fri, 15 Jun 2012 15:10:19 +0200 |
Adrian Buehlmann |
test-merge-tools: inline pointless domerge function
|
file |
diff |
annotate
|
| Tue, 22 Nov 2011 01:37:26 +0100 |
Mads Kiilerich |
tests: test findexe() access check fixed in 58f96703a9ab
|
file |
diff |
annotate
|
| Thu, 17 Nov 2011 23:02:18 -0600 |
Matt Mackall |
merge with crew
|
file |
diff |
annotate
|
| Wed, 16 Nov 2011 03:45:14 +0100 |
Mads Kiilerich |
tests: add 'hghave system-sh' to skip tests on windows
|
file |
diff |
annotate
|
| Wed, 16 Nov 2011 18:04:19 -0600 |
Matt Mackall |
merge: give a special message for internal:merge failure (issue3105)
|
file |
diff |
annotate
|
| Wed, 12 Oct 2011 21:45:58 -0400 |
Greg Ward |
merge: expand environment variables and ~/ in tool.executable
|
file |
diff |
annotate
|
| Thu, 13 Oct 2011 04:27:49 +0200 |
Mads Kiilerich |
tests: cleanup of echo statements left over from test conversion
|
file |
diff |
annotate
|
| Fri, 18 Feb 2011 03:35:01 +0100 |
Mads Kiilerich |
util: flush stdout before calling external processes
stable
|
file |
diff |
annotate
|
| Tue, 19 Oct 2010 22:33:52 -0500 |
Steve Borho |
merge: implement --tool arguments using new ui.forcemerge configurable
|
file |
diff |
annotate
|
| Sun, 26 Sep 2010 13:43:21 -0500 |
Matt Mackall |
tests: unify test-merge-tools
|
file |
diff |
annotate
| base
|