tests/test-merge5.out
author Thomas Arendsen Hein <thomas@intevation.de>
Thu, 04 Aug 2005 17:23:31 +0100
changeset 830 ca080d28d0af
parent 814 0902ffece4b4
child 819 77e121a0d870
child 824 0932bc2fb2be
child 836 1fe3b14c7044
permissions -rw-r--r--
If rejects are empty after using the editor, merge with diff+patch was ok.

+ 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 perform a branch merge)