log tests/test-merge8 @ 10526:72d3a02c62e6 stable

age author description
Sat, 14 Oct 2006 10:53:29 +0200 Thomas Arendsen Hein Test for ba7c74081861 (update dirstate correctly for non-branchmerge updates)