merge: handle --ff/--no-ff/--ff-only as a tri-state option
[git] / t / t9126 /
drwxr-xr-x   ..
-rw-r--r-- 2355 follow-deleted-readded.dump