merge: handle --ff/--no-ff/--ff-only as a tri-state option
[git] / t / t9604 /
drwxr-xr-x   ..
drwxr-xr-x - cvsroot