Mercurial > hg

log tests/test-merge-tools.t @ 39121:7c6044634957

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
less more | (0) tip
age author description
Mon, 23 Jul 2018 22:51:53 -0700 Martin von Zweigbergk mergetool: warn if ui.merge points to nonexistent tool
Mon, 23 Jul 2018 22:51:50 -0700 Martin von Zweigbergk tests: demonstrate that no requested merge tool is ignored if missing
Wed, 16 May 2018 14:11:41 -0600 hindlemail filemerge: support specifying a python function to custom merge-tools
Thu, 17 May 2018 21:55:00 +0900 Yuya Nishihara test-merge-tools: create repo directory to free $TESTTMP for temporary files
Wed, 21 Mar 2018 12:36:29 -0700 Kyle Lippincott filemerge: make the 'local' path match the format that 'base' and 'other' use
Tue, 20 Mar 2018 21:10:29 -0400 Matt Harbison test-merge-tools: stabilize for Windows
Fri, 19 Jan 2018 19:07:58 -0800 Kyle Lippincott filemerge: use a single temp dir instead of temp files
Sun, 04 Mar 2018 16:23:03 -0500 Augie Fackler tests: stop over-specifying tempfile name
Sun, 11 Feb 2018 20:59:35 -0500 Matt Harbison test-merge-tools: stabilize for Windows
Fri, 09 Feb 2018 13:18:17 +0100 Boris Feld test: glob the temporary directory out of temporary file path
Wed, 17 Jan 2018 17:35:05 -0800 Kyle Lippincott filemerge: support passing labels to external merge tools
Mon, 08 Jan 2018 19:41:47 +0530 Pulkit Goyal merge: add `--abort` flag which can abort the merge
Sat, 13 May 2017 03:37:50 +0900 FUJIWARA Katsunori debugcommands: add debugpickmergetool to examine which merge tool is chosen
Sat, 13 May 2017 03:31:42 +0900 FUJIWARA Katsunori filemerge: add internal merge tool to dump files forcibly
Sat, 13 May 2017 03:28:36 +0900 FUJIWARA Katsunori filemerge: make warning message more i18n friendly
Sat, 13 May 2017 03:28:36 +0900 FUJIWARA Katsunori filemerge: show warning about choice of :prompt only at an actual fallback
Wed, 23 Nov 2016 23:47:38 +0100 Mads Kiilerich merge: use original file extension for temporary files
Sat, 19 Nov 2016 15:41:37 -0800 Kostia Balytskyi conflicts: make spacing consistent in conflict markers
Fri, 07 Oct 2016 08:51:50 -0700 Simon Farnsworth merge: add conflict labels to merge command
Tue, 01 Dec 2015 09:48:38 -0800 Siddharth Agarwal filemerge: default regular prompts to 'leave unresolved' (BC)
Mon, 30 Nov 2015 11:17:18 -0800 Siddharth Agarwal filemerge: add a 'leave unresolved' option to regular prompts
Wed, 11 Nov 2015 10:19:11 -0800 Martin von Zweigbergk filemerge: remove leading space from " no tool found..."
Tue, 10 Nov 2015 17:16:59 -0800 Siddharth Agarwal resolve: don't abort when file is missing
Tue, 10 Nov 2015 17:13:16 -0800 Siddharth Agarwal filemerge: treat EOF at prompt as fail, not abort
Tue, 10 Nov 2015 17:10:47 -0800 Siddharth Agarwal test-merge-tools.t: add 'hg resolve --list' output to tests
Wed, 14 Oct 2015 12:57:33 -0400 Augie Fackler merge-tools: allow marking a mergetool as completely disabled
Fri, 09 Oct 2015 13:54:52 -0700 Siddharth Agarwal simplemerge: move conflict warning message to filemerge
Sun, 11 Oct 2015 20:47:14 -0700 Siddharth Agarwal filemerge: break overall filemerge into separate premerge and merge steps
Wed, 02 Sep 2015 16:56:04 -0400 timeless test-merge-tools: include /usr/sbin in path for sysctl (issue4813)
Wed, 08 Jul 2015 17:01:09 +0900 FUJIWARA Katsunori context: write dirstate out explicitly after marking files as clean
Fri, 24 Apr 2015 23:52:41 +0900 FUJIWARA Katsunori revert: apply normallookup on reverted file if size isn't changed (issue4583) stable
Fri, 17 Apr 2015 15:42:20 -0500 Matt Mackall tests: fix portability issue with test-merge-tools stable
Tue, 10 Feb 2015 16:17:15 -0800 Martin von Zweigbergk test-merge-tools: fix flaky test by avoiding debugsetparents
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
Mon, 04 Aug 2014 16:50:15 -0700 Pierre-Yves David mergetools: add a test for premerge --keep
Mon, 04 Aug 2014 16:39:47 -0700 Pierre-Yves David test-merge-tools: introduce a "revision 4" that merges with conflict
Mon, 26 May 2014 11:44:58 -0700 Pierre-Yves David merge: drop the quotes around commit description
Mon, 19 May 2014 01:53:34 +0200 Mads Kiilerich update: introduce --tool for controlling the merge tool
Thu, 08 May 2014 16:50:22 -0700 Durham Goode merge: add conflict marker formatter (BC)
Sun, 02 Jun 2013 15:27:08 -0500 Matt Mackall tests: avoid writing files to HGTMP
Tue, 15 Jan 2013 01:05:11 +0100 Mads Kiilerich merge: warn when internal:merge cannot merge symlinks
Tue, 08 Jan 2013 04:15:41 +0100 Mads Kiilerich merge: make internal merge fail cleanly on symlinks
Thu, 01 Nov 2012 14:59:55 -0500 Matt Mackall tests: fix test for issue3581 for vfat on Linux stable 2.4
Tue, 30 Oct 2012 17:23:51 -0700 Keegan Carruthers-Smith filemerge: only run test for issue3581 on non-windows environments stable
Fri, 26 Oct 2012 12:02:58 -0700 Keegan Carruthers-Smith filemerge: use util.shellquote when calling merge (issue3581) stable
Fri, 17 Aug 2012 13:58:18 -0700 timeless spelling: nonexistent
Fri, 15 Jun 2012 00:02:27 +0200 Mads Kiilerich tests: add some missing #if's / hghave requirements
Fri, 15 Jun 2012 17:32:33 +0200 Adrian Buehlmann test-merge-tools: adapt for Windows
Fri, 15 Jun 2012 15:10:19 +0200 Adrian Buehlmann test-merge-tools: inline pointless domerge function
Tue, 22 Nov 2011 01:37:26 +0100 Mads Kiilerich tests: test findexe() access check fixed in 58f96703a9ab
Thu, 17 Nov 2011 23:02:18 -0600 Matt Mackall merge with crew
Wed, 16 Nov 2011 03:45:14 +0100 Mads Kiilerich tests: add 'hghave system-sh' to skip tests on windows
Wed, 16 Nov 2011 18:04:19 -0600 Matt Mackall merge: give a special message for internal:merge failure (issue3105)
Wed, 12 Oct 2011 21:45:58 -0400 Greg Ward merge: expand environment variables and ~/ in tool.executable
Thu, 13 Oct 2011 04:27:49 +0200 Mads Kiilerich tests: cleanup of echo statements left over from test conversion
Fri, 18 Feb 2011 03:35:01 +0100 Mads Kiilerich util: flush stdout before calling external processes stable
Tue, 19 Oct 2010 22:33:52 -0500 Steve Borho merge: implement --tool arguments using new ui.forcemerge configurable
Sun, 26 Sep 2010 13:43:21 -0500 Matt Mackall tests: unify test-merge-tools base tests/test-merge-tools@5d73464d7488
less more | (0) tip