From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 28 Oct 2013 17:16:11 +0000 (-0700)
Subject: Merge branch 'jk/diff-algo' into maint
X-Git-Tag: v1.8.4.2~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b28325d3ab0172063d1fbe0e735d899ae43c6fee;p=thirdparty%2Fgit.git

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
---

b28325d3ab0172063d1fbe0e735d899ae43c6fee