merge: handle --ff/--no-ff/--ff-only as a tri-state option
[git] / t / t4034 / ruby /
drwxr-xr-x   ..
-rw-r--r-- 1989 expect
-rw-r--r-- 234 post
-rw-r--r-- 228 pre