Andrew's git / gitweb.git / t/t4110/patch5.patch
?
t / t4110 / patch5.patchon commit t6042: add testcase covering rename/rename(2to1)/delete/delete conflict (eee7338)
   1diff --git a/new.txt b/new.txt
   2--- a/new.txt
   3+++ b/new.txt
   4@@ -10,3 +10,7 @@
   5 c11
   6 c111
   7 c1111
   8+c2
   9+c22
  10+c222
  11+c2222