Merge branch 'en/merge-options-ff-and-friends'
authorJunio C Hamano <gitster@pobox.com>
Mon, 30 Sep 2019 04:19:28 +0000 (13:19 +0900)
committerJunio C Hamano <gitster@pobox.com>
Mon, 30 Sep 2019 04:19:28 +0000 (13:19 +0900)
Doc update.

* en/merge-options-ff-and-friends:
  merge-options.txt: clarify meaning of various ff-related options

1  2 
Documentation/merge-options.txt

Simple merge