log tests/test-merge7 @ 1351:0e2be889ccd7

age author description
Mon, 26 Sep 2005 16:52:47 -0700 Matt Mackall Repair ancestor logic, fix up test cases