Merge branch 'jk/diff-algo' into maint

"git merge-recursive" did not parse its "--diff-algorithm=" command
line option correctly.

* jk/diff-algo:
merge-recursive: fix parsing of "diff-algorithm" option

diff --cc merge-recursive.c
Simple merge