merge: handle --ff/--no-ff/--ff-only as a tri-state option
[git] / t / t9700 /
drwxr-xr-x   ..
-rwxr-xr-x 5545 test.pl