tests/test-merge3.out
author Matt Mackall <mpm@selenic.com>
Thu, 30 Nov 2006 17:36:33 -0600
changeset 3731 b4af5f92e04b
parent 1747 91c56c427171
permissions -rw-r--r--
merge: move check for empty ancestor into findcopies

removing b
nothing changed