Merge branch 'mk/show-s-no-extra-blank-line-for-merges'
[git] / contrib / diff-highlight /
drwxr-xr-x   ..
-rw-r--r-- 5343 README
-rwxr-xr-x 3811 diff-highlight