tests/test-merge3.out
author Matt Mackall <mpm@selenic.com>
Sun, 17 Sep 2006 21:11:26 -0500
changeset 3121 1c1e59aac82a
parent 1747 91c56c427171
permissions -rw-r--r--
merge: simplify local created logic

removing b
nothing changed