merge-recursive: fix assumption that head tree being merged is HEAD
[gitweb.git] / t / t4051 /
drwxr-xr-x   parent (dest: t; base: e1f8694f3394caf3d3cd57c6c7593f0b0cdb1f9e)
-rw-r--r-- 224 appended1.c
-rw-r--r-- 1385 appended2.c
-rw-r--r-- 88 dummy.c
-rw-r--r-- 334 hello.c
-rw-r--r-- 407 includes.c