Merge branch 'tg/conflict-marker-size' into maint
[gitweb.git] / negotiator /
drwxr-xr-x   parent (dest: ; base: 04d70dd64837a088f1e95286e328801085631e82)
-rw-r--r-- 4258 default.c
-rw-r--r-- 160 default.h
-rw-r--r-- 6011 skipping.c
-rw-r--r-- 163 skipping.h