t7605: add a testcase demonstrating a bug with trivial merges
[gitweb.git] / t / t4020 /
drwxr-xr-x   parent (dest: t; base: ef7d3621d76fe210827698cba79c737906048191)
-rw-r--r-- 116 diff.NUL