log tests/test-merge-commit.t @ 38122:26b73fad45d9

age author description
Mon, 02 Apr 2018 16:47:53 -0700 Gregory Szorc debugcommands: drop offset and length from debugindex by default
Mon, 02 Apr 2018 16:28:20 -0700 Gregory Szorc debugcommands: drop base revision from debugindex
Thu, 12 Oct 2017 09:39:50 +0200 Denis Laxalde transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Mon, 29 Feb 2016 01:01:20 -0500 Matt Harbison tests: flag Windows specific lines about background closing as optional
Wed, 25 Nov 2015 14:25:26 -0800 Siddharth Agarwal filemerge: add debug output for whether this is a change/delete conflict
Sun, 11 Oct 2015 21:56:39 -0700 Siddharth Agarwal merge.mergestate: perform all premerges before any merges (BC)
Wed, 07 Oct 2015 00:01:16 -0700 Siddharth Agarwal filemerge: normalize 'internal:foo' names to ':foo'
Sat, 09 May 2015 23:40:40 -0700 Pierre-Yves David progress: get the extremely verbose output out of default debug
Tue, 22 Apr 2014 02:10:25 +0200 Mads Kiilerich merge: change debug logging - test output changes but no real changes
Fri, 08 Feb 2013 15:23:23 +0000 Siddharth Agarwal manifestmerge: pass in branchmerge and force separately
Thu, 24 Jan 2013 23:57:44 +0100 Mads Kiilerich merge: delay debug messages for merge actions
Wed, 11 Jul 2012 15:03:10 -0700 Bryan O'Sullivan tests: reduce spurious failures when run with generaldelta
Mon, 11 Jun 2012 01:40:51 +0200 Mads Kiilerich tests: add missing trailing 'cd ..'
Fri, 09 Dec 2011 17:34:53 +0100 Martin Geisler merge: make debug output easier to read
Wed, 04 May 2011 13:37:41 +0200 Sune Foldager tests: fix deprecated use of hg debugdata/debugindex
Wed, 20 Oct 2010 17:38:21 -0500 Kevin Bullock pull: silence spurious 'requesting all changes' message stable
Fri, 17 Sep 2010 17:03:08 -0500 Matt Mackall tests: fix a bunch of pointless #s in unified tests
Sat, 11 Sep 2010 11:18:47 +0200 Adrian Buehlmann tests: unify test-merge-commit base tests/test-merge-commit@f472f2c29ba3