merge-recursive: fix rename handling

[git/dscho.git] / t / t4101 / diff.2-3

--- a/frotz
+++ b/frotz
@@ -1,2 +1,3 @@
 a
+c
 b
\ No newline at end of file