merge: handle --ff/--no-ff/--ff-only as a tri-state option
[git] / t / t5100 / patch0013