tests/test-merge5.out
author mark.williamson@cl.cam.ac.uk
Sun, 14 Aug 2005 12:30:01 -0800
changeset 899 aa5b726e9619
parent 839 9c918287d10b
child 925 5a034646e472
permissions -rw-r--r--
Add '-' support to the commit logfile option to read message from stdin.

+ hg init
+ hg add a b
+ hg commit -m commit #0 -d 0 0
+ hg commit -mcomment #1 -d 0 0
+ hg update 0
+ hg commit -A -mcomment #2 -d 0 0
removing b
+ hg update 1
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)