tests/test-merge5.out
author "Mathieu Clabaut <mathieu.clabaut@gmail.com>"
Wed, 02 Aug 2006 09:29:17 +0200
changeset 2773 871ca5b9d348
parent 2175 b2ae81a7df29
child 2830 49988d9f0758
permissions -rw-r--r--
Import say a file is not tracked after patching : test case

1 files updated, 0 files merged, 0 files removed, 0 files unresolved
removing b
this update spans a branch affecting the following files:
 b
aborting update spanning branches!
(use 'hg merge' to merge across branches or 'hg update -C' to lose changes)