tests/test-merge3.out
author Matt Mackall <mpm@selenic.com>
Mon, 26 Sep 2005 16:52:47 -0700
changeset 1351 0e2be889ccd7
parent 925 5a034646e472
child 1747 91c56c427171
permissions -rw-r--r--
Repair ancestor logic, fix up test cases

removing b
b never committed!
nothing changed