merge-recursive: Avoid doubly merging rename/add conflict contents
[gitweb.git] / compat / vcbuild /
drwxr-xr-x   parent (dest: compat; base: 2a669c341a857f53d946dec762e6f22a54b12dd2)
-rw-r--r-- 1906 README
drwxr-xr-x - include
drwxr-xr-x - scripts