Andrew's git / gitweb.git / t/t5100/patch0018
?
t / t5100 / patch0018on commit merge-recursive: make "CONFLICT (rename/delete)" message show both paths (b26d87f)
   1diff --git a/foo b/foo
   2index e69de29..d95f3ad 100644
   3--- a/foo
   4+++ b/foo
   5@@ -0,0 +1 @@
   6+content