merge: handle --ff/--no-ff/--ff-only as a tri-state option
[gitweb.git] / contrib / diff-highlight /
drwxr-xr-x   parent (dest: contrib; base: a54841e96b78203598dea6b31b9618f40f107e7b)
-rw-r--r-- 5343 README
-rwxr-xr-x 3811 diff-highlight