tests/test-merge5.out
author Bryan O'Sullivan <bos@serpentine.com>
Thu, 22 Sep 2005 21:42:33 -0700
changeset 1319 5a15df632e6a
parent 925 5a034646e472
child 2019 ced2d3620f95
permissions -rw-r--r--
Fix behaviour of commit. It's now a fatal error if the option to --logfile isn't readable. Ditto if both --message and --logfile are specified.

removing b
this update spans a branch affecting the following files:
 b
aborting update spanning branches!
(use update -m to merge across branches or -C to lose changes)