tests/test-conflict.out
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Thu, 01 Dec 2005 10:51:45 -0600
changeset 1568 1d7d0c07e8f3
parent 925 5a034646e472
child 1933 7544700fd931
permissions -rw-r--r--
make all commands be repo-wide by default - refactor code in commands.py so that: if no pattern is given, the command will be repo-wide else it will work on the working dir - update the doc - fix the tests

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