tests/test-merge5.out
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Sat, 25 Aug 2007 16:31:37 +0200
changeset 5226 79279b5583c6
parent 3592 fffc8a733bf9
permissions -rw-r--r--
cgi: sys.path.insert should be before importing mercurial thanks to R. Burke

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