Merge branch 'en/disable-dir-rename-in-recursive-merge'
[gitweb.git] / negotiator /
drwxr-xr-x   parent (dest: ; base: 0bdaec1d3db90d69041531311fb34fa09639589b)
-rw-r--r-- 4258 default.c
-rw-r--r-- 160 default.h
-rw-r--r-- 6011 skipping.c
-rw-r--r-- 163 skipping.h