log tests/test-merge8.out @ 4114:d5011e347476

age author description
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)