tests/test-merge5.out
author Emanuele Aina <em@nerd.ocracy.org>
Tue, 27 Feb 2007 09:05:36 +0100
changeset 4120 f9dc36b1bdd5
parent 3592 fffc8a733bf9
child 6336 4b0c9c674707
permissions -rw-r--r--
Print relative names in the purge extension

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