tests/test-merge-force.out
author Steve Borho <steve@borho.org>
Thu, 26 Mar 2009 22:07:01 -0500
changeset 7913 1b1b3dd630a5
parent 6336 4b0c9c674707
child 8545 3682a19bb637
permissions -rw-r--r--
windows: hoist expand_glob() back into util.py The windows version of expand_glob() requires patkind(). To avoid a circular dependency, move function back into util.py.

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