merge: fix numerus bugs around "trivial merge" area
[gitweb.git] / t / t4020 /
drwxr-xr-x   parent (dest: t; base: 446247db78a733f44d2470afb1f1983d28058159)
-rw-r--r-- 116 diff.NUL