tests/test-merge5.out
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Thu, 07 Sep 2006 14:12:39 +0200
changeset 3063 035fd2029575
parent 2830 49988d9f0758
child 3580 41989e55fa37
permissions -rw-r--r--
git --diff: fix traceback when getting mode change - use the manifest instead of the mode in the working dir if the diff is against two revisions - add a testcase

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