Merge branch 'vr/git-merge-default-to-upstream'
[git] / contrib / diff-highlight /
drwxr-xr-x   ..
-rw-r--r-- 2519 README
-rwxr-xr-x 2583 diff-highlight