git-merge: add --no-ff example
git-merge: add --no-ff example

Include an example and brief description of the --no-ff option
felixonmars/tldr,felixonmars/tldr,slash3b/tldr,slash3b/tldr,felixonmars/tldr,slash3b/tldr