tests/test-conflict.out
author Bryan O'Sullivan <bos@serpentine.com>
Thu, 18 Aug 2005 14:58:14 -0800
changeset 943 e8e5db72ed51
parent 925 5a034646e472
child 1933 7544700fd931
permissions -rw-r--r--
Add --cwd global option, to change directory before doing anything. Useful for interacting with a program presenting a UI, such as Emacs.

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