log tests/test-merge7.t @ 20273:d9d6cbbeef0d

age author description
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, 16 Nov 2011 18:04:19 -0600 Matt Mackall merge: give a special message for internal:merge failure (issue3105)
Wed, 04 May 2011 13:37:41 +0200 Sune Foldager tests: fix deprecated use of hg debugdata/debugindex
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
Wed, 18 Aug 2010 05:54:00 +0530 Pradeepkumar Gayam tests: unify test-merge7 base tests/test-merge7@881279ed37e5