merge: handle --ff/--no-ff/--ff-only as a tri-state option
[git] / t / t1509 /
drwxr-xr-x   ..
-rw-r--r-- 96 excludes
-rwxr-xr-x 1140 prepare-chroot.sh