tests/test-merge5.out
author Patrick Mezard <pmezard@gmail.com>
Sat, 06 Oct 2007 17:54:33 +0200
changeset 5399 18f8abefdb2a
parent 3592 fffc8a733bf9
permissions -rw-r--r--
Fix bad lambda prototype in workingctx.fileflags()

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