tests/test-merge3.out
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Wed, 14 Dec 2005 22:19:03 -0600
changeset 1581 db10b7114de0
parent 925 5a034646e472
child 1747 91c56c427171
permissions -rw-r--r--
abort when merging two heads and repository has local changes

removing b
b never committed!
nothing changed