tests/test-merge5.out
author Emanuele Aina <em@nerd.ocracy.org>
Wed, 06 Jun 2007 22:17:35 +0200
changeset 4691 ca4971347e0a
parent 3592 fffc8a733bf9
permissions -rw-r--r--
purge: don't delete ignored files if --all is not specified

1 files updated, 0 files merged, 0 files removed, 0 files unresolved
removing b
abort: update spans branches, use 'hg merge' or 'hg update -C' to lose changes