--- a/tests/test-merge-remove.t Wed Feb 05 17:23:35 2014 -0600
+++ b/tests/test-merge-remove.t Mon Feb 10 00:43:54 2014 +0100
@@ -85,3 +85,30 @@
$ hg diff
+Merge should not overwrite local file that is untracked after remove
+
+ $ rm *
+ $ hg up -qC
+ $ hg rm bar
+ $ hg ci -m 'remove bar'
+ $ echo 'memories of buried pirate treasure' > bar
+ $ hg merge
+ bar: untracked file differs
+ abort: untracked files in working directory differ from files in requested revision
+ [255]
+ $ cat bar
+ memories of buried pirate treasure
+
+Those who use force will lose
+
+ $ hg merge -f
+ remote changed bar which local deleted
+ use (c)hanged version or leave (d)eleted? c
+ merging foo1 and foo to foo1
+ 1 files updated, 1 files merged, 0 files removed, 0 files unresolved
+ (branch merge, don't forget to commit)
+ $ cat bar
+ bleh
+ $ hg st
+ M bar
+ M foo1