Merge branch 'en/merge-options-ff-and-friends'
Doc update. * en/merge-options-ff-and-friends: merge-options.txt: clarify meaning of various ff-related options
Junio C Hamano committed
Sep 30, 2019 at 13:19 UTC
9bc67b6658a031b92cba4a7489b78a4da902ecbf
No changes.