merge: handle --ff/--no-ff/--ff-only as a tri-state option
[git] / t / t4034 / fortran /
drwxr-xr-x   ..
-rw-r--r-- 321 expect
-rw-r--r-- 69 post
-rw-r--r-- 64 pre