tests/test-conflict.out
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Thu, 27 Oct 2005 13:40:56 -0700
changeset 1473 7d66ce9895fa
parent 925 5a034646e472
child 1933 7544700fd931
permissions -rw-r--r--
make readconfig take a filename instead of a file pointer as argument catch parse error while reading a config file add a testcase for parse error

merge: warning: conflicts during merge
merging a
merging a failed!
32e80765d7fe+75234512624c+ tip
something else
=======
something
M a