merge: introduce merge.ff configuration variable
[git] / t / t5100 / msg0013