sapling/tests/test-merge-force.out

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
warn about new heads on commit (issue842) 2008-03-21 13:06:02 +03:00			`created new head`
add a test for 6acd9ff3f1ac 2008-03-14 15:56:58 +03:00			`% local deleted a file, remote removed`
merge: require --force when there are deleted files 2008-03-14 15:56:58 +03:00			`abort: outstanding uncommitted changes`
add a test for 6acd9ff3f1ac 2008-03-14 15:56:58 +03:00			`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`