am --skip: revert changes introduced by failed 3way merge
[git] / contrib / diff-highlight /
drwxr-xr-x   ..
-rw-r--r-- 5343 README
-rwxr-xr-x 3965 diff-highlight