tests/test-merge5.out
author Patrick Mezard <pmezard@gmail.com>
Wed, 13 Feb 2008 00:40:18 +0100
changeset 6101 abb1c451a88e
parent 3592 fffc8a733bf9
child 6336 4b0c9c674707
permissions -rw-r--r--
Define tla username locally in baz and tla tests Suggested by Alexis S. L. Carvalho.

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