merge: handle --ff/--no-ff/--ff-only as a tri-state option
[git] / t / t4034 / html /
drwxr-xr-x   ..
-rw-r--r-- 459 expect
-rw-r--r-- 116 post
-rw-r--r-- 79 pre