merge-recursive: switch from (oid,mode) pairs to a diff_filespec
[gitweb.git] / negotiator /
drwxr-xr-x   parent (dest: ; base: 8daec1df03de)
-rw-r--r-- 4258 default.c
-rw-r--r-- 160 default.h
-rw-r--r-- 6011 skipping.c
-rw-r--r-- 163 skipping.h