tests/test-conflict.t
Tue, 06 Jun 2017 22:17:39 +0530 Pulkit Goyal update: show the commit to which we updated in case of multiple heads (BC)
Sat, 25 Feb 2017 19:36:02 +0900 Yuya Nishihara filemerge: optionally strip quotes from merge marker template (BC)
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
Wed, 10 Feb 2016 09:06:08 -0800 Ryan McElroy merge: minimize conflicts when common base is not shown (issue4447)
Tue, 02 Feb 2016 14:49:02 +0000 Pierre-Yves David update: warn about other topological heads on bare update
Fri, 09 Oct 2015 13:54:52 -0700 Siddharth Agarwal simplemerge: move conflict warning message to filemerge
Thu, 10 Sep 2015 09:41:11 -0400 Jordi GutiƩrrez Hermoso filemerge: add non-interactive :merge-local and :merge-other
Tue, 05 Aug 2014 14:58:45 -0700 Pierre-Yves David merge: add an internal:merge3 tool
Fri, 18 Jul 2014 21:49:52 -0500 Matt Mackall filemerge: use non-minimal conflict marker regions (BC)
Mon, 09 Jun 2014 03:49:07 -0700 Pierre-Yves David test: use more elaborated content in ``test-conflict.t``
Sun, 06 Jul 2014 02:56:41 +0900 FUJIWARA Katsunori filemerge: use 'util.ellipsis' to trim custom conflict markers correctly
Sun, 06 Jul 2014 02:56:41 +0900 FUJIWARA Katsunori filemerge: use only the first line of the generated conflict marker for safety
Mon, 26 May 2014 11:44:58 -0700 Pierre-Yves David merge: drop the quotes around commit description
Thu, 08 May 2014 16:50:22 -0700 Durham Goode merge: add conflict marker formatter (BC)
Wed, 16 Nov 2011 18:04:19 -0600 Matt Mackall merge: give a special message for internal:merge failure (issue3105)
Thu, 16 Sep 2010 17:51:32 -0500 Matt Mackall tests: add exit codes to unified tests
Sun, 12 Sep 2010 18:05:53 -0500 Brodie Rao merge: suggest 'hg up -C .' for discarding changes, not 'hg up -C'
Thu, 02 Sep 2010 23:22:51 +0200 Martin Geisler tests: remove unneeded -d flags
Thu, 12 Aug 2010 20:02:59 +0900 Nicolas Dumazet tests: unify test-conflict
less more (0) tip