Mercurial > hg

log tests/test-merge-tools.t @ 22245:234e4c24b980

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
less more | (0) tip
age author description
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