tests/test-merge-force.out
author Paolo Giarrusso <p.giarrusso@gmail.com>
Thu, 12 Aug 2010 16:53:56 +0200
branchstable
changeset 11827 41ec53065611
parent 8545 3682a19bb637
permissions -rw-r--r--
i18n-it: update many broken fuzzy messages I started updating many fuzzy messages which no longer expressed the intended meaning - new translations are inserted only to keep coherence. Not all fuzzy messages have been fixed, yet.

created new head
% local deleted a file, remote removed
abort: outstanding uncommitted changes (use 'hg status' to list 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