merge: teach -Xours/-Xtheirs to symbolic link merge
[gitweb.git] / t / t4051 /
drwxr-xr-x   parent (dest: t; base: fd48b464747c275b3d014b3f14d60d9ac19d184a)
-rw-r--r-- 224 appended1.c
-rw-r--r-- 1385 appended2.c
-rw-r--r-- 88 dummy.c
-rw-r--r-- 309 hello.c
-rw-r--r-- 407 includes.c