tests/test-merge5.out
author Sébastien Pierre <sebastien@xprima.com>
Sat, 27 May 2006 15:04:40 -0700
changeset 2349 88c881bda888
parent 2175 b2ae81a7df29
child 2830 49988d9f0758
permissions -rw-r--r--
darcs2hg.py: import darcs project into mercurial For now, the tags are not taken into account (so you have to reenter the tags by hand)

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)