log tests/test-merge8.out @ 4744:44e17f5029d0

age author description
Tue, 08 May 2007 02:59:13 -0500 Matt Mackall merge: fix spurious merges for copies in linear updates
Thu, 05 Apr 2007 16:43:18 -0500 Matt Mackall merge: fix a bug where copies were ignored
Sat, 18 Nov 2006 11:34:19 -0600 Matt Mackall avoid unnecessary copy merges
Sat, 14 Oct 2006 10:53:29 +0200 Thomas Arendsen Hein Test for ba7c74081861 (update dirstate correctly for non-branchmerge updates)