diff -r b9f7b0c10027 -r 69ffbbe73dd0 tests/test-up-local-change.t
--- a/tests/test-up-local-change.t	Wed Oct 19 18:06:14 2016 +0200
+++ b/tests/test-up-local-change.t	Tue Oct 25 21:01:53 2016 +0200
@@ -242,4 +242,11 @@
   -a
   +b
 
+test for superfluous filemerge of clean files renamed in the past
+
+  $ hg up -qC tip
+  $ echo c > c
+  $ hg add c
+  $ hg up -qt:fail 0
+
   $ cd ..