log tests/test-double-merge.t @ 21605:f9dabfceb259

age author description
Tue, 22 Apr 2014 02:10:25 +0200 Mads Kiilerich merge: change debug logging - test output changes but no real changes
Sun, 02 Mar 2014 18:52:16 +0100 Mads Kiilerich merge: keep destination filename as key in filemerge actions
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, 26 Dec 2012 15:03:58 -0800 Siddharth Agarwal copies: make debug messages more sensible
Mon, 11 Jun 2012 01:40:51 +0200 Mads Kiilerich tests: add missing trailing 'cd ..'
Wed, 23 May 2012 21:34:29 +0200 Thomas Arendsen Hein merge: show renamed on one and deleted on the other side in debug output
Fri, 09 Dec 2011 17:34:53 +0100 Martin Geisler merge: make debug output easier to read
Thu, 02 Sep 2010 23:22:51 +0200 Martin Geisler tests: remove unneeded -d flags
Wed, 18 Aug 2010 04:30:27 +0530 Pradeepkumar Gayam tests: unify test-double-merge base tests/test-double-merge@86ae4de44a04