mergetool: honor tempfile configuration when resolving delete conflicts
[gitweb.git] / t / t4110 /
drwxr-xr-x   parent (dest: t; base: a2986045e3da24c850da03eaf2f2e2a56f8d4fff)
-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