tests/test-merge3.out
author Matt Mackall <mpm@selenic.com>
Thu, 12 Nov 2009 12:03:39 -0600
changeset 9843 d1043c2ffe6c
parent 1747 91c56c427171
permissions -rw-r--r--
merge: fix changectx.ancestor(workingctx) (issue1327)

removing b
nothing changed