tests/test-merge-force.out
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Sun, 19 Oct 2008 20:16:37 +0200
changeset 7174 4da87407b845
parent 6336 4b0c9c674707
child 8545 3682a19bb637
permissions -rw-r--r--
parsers.c: fix integer overflows thanks to zzuf for helping finding those

created new head
% local deleted a file, remote removed
abort: outstanding uncommitted changes
resolving manifests
removing a
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
(branch merge, don't forget to commit)
% should show a as removed
R a
% manifest. should not have a:
b