tests/test-merge3.out
author Matt Mackall <mpm@selenic.com>
Fri, 17 Feb 2006 17:23:53 -0600
changeset 1716 ef8cd889a78b
parent 925 5a034646e472
child 1747 91c56c427171
permissions -rw-r--r--
Refactor excessive merge detection, add test

removing b
b never committed!
nothing changed