merge: handle --ff/--no-ff/--ff-only as a tri-state option
[git] / contrib / diff-highlight /
drwxr-xr-x   ..
-rw-r--r-- 5343 README
-rwxr-xr-x 3811 diff-highlight