merge: handle --ff/--no-ff/--ff-only as a tri-state option
[git] / t / t0200 /
drwxr-xr-x   ..
-rw-r--r-- 831 test.c
-rw-r--r-- 475 test.perl
-rw-r--r-- 463 test.sh