--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/test-merge-force.t	Sat Sep 11 17:58:37 2010 +0200
@@ -0,0 +1,43 @@
+  $ hg init
+
+  $ echo a > a
+  $ hg ci -qAm 'add a'
+
+  $ echo b > b
+  $ hg ci -qAm 'add b'
+
+  $ hg up -qC 0
+  $ hg rm a
+  $ hg ci -m 'rm a'
+  created new head
+
+  $ hg up -qC 1
+  $ rm a
+
+Local deleted a file, remote removed
+
+Should fail, since there are deleted files:
+
+  $ hg merge
+  abort: outstanding uncommitted changes (use 'hg status' to list changes)
+
+Should succeed with --force:
+
+  $ hg -v merge --force
+  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:
+
+  $ hg status
+  R a
+
+  $ hg ci -m merge
+
+Should not show 'a':
+
+  $ hg manifest
+  b
+