Merge branch 'da/difftool-mergetool-simplify-reporting-status'
[gitweb.git] / t / t4110 /
drwxr-xr-x   parent (dest: t; base: 0ddedd4d6b9b3e8eb3557d8ed28e1a0b354a25f8)
-rw-r--r-- 90 expect
-rw-r--r-- 163 patch1.patch
-rw-r--r-- 112 patch2.patch
-rw-r--r-- 131 patch3.patch
-rw-r--r-- 112 patch4.patch
-rw-r--r-- 117 patch5.patch