Andrew's git / gitweb.git / t/t4110/patch2.patch
?
t / t4110 / patch2.patchon commit merge-recursive: make "CONFLICT (rename/delete)" message show both paths (b26d87f)
   1diff --git a/new.txt b/new.txt
   2--- a/new.txt
   3+++ b/new.txt
   4@@ -1,7 +1,3 @@
   5-a1
   6-a11
   7-a111
   8-a1111
   9 b1
  10 b11
  11 b111