tests/test-merge5.out
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Sun, 24 Sep 2006 13:52:25 +0200
changeset 3152 d01e4cb2f5f2
parent 2830 49988d9f0758
child 3580 41989e55fa37
permissions -rw-r--r--
cleanups in revlog.lookup - add comments - do a clean separation of the different cases - don't use a list of each possible node when doing the lookup, just keep the previous entry

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