tests/test-merge5.out
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Mon, 28 Aug 2006 21:49:02 +0200
changeset 3016 aebc3f64b20f
parent 2830 49988d9f0758
child 3580 41989e55fa37
permissions -rw-r--r--
fix incorrect warning when walking on a particular rev when a directory was given instead of a file it reported incorrectly 'No such file or directory in rev <rev>' we test if the file is a prefix directory

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