From: Jonathan Nieder Date: Mon, 14 Oct 2013 17:59:51 +0000 (-0700) Subject: Merge branch 'jk/diff-algo' X-Git-Tag: v1.8.5-rc0~66 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/92d2afd563afca4d6b4c20c7e2e859bc7219a3b1 Merge branch 'jk/diff-algo' * jk/diff-algo: merge-recursive: fix parsing of "diff-algorithm" option --- 92d2afd563afca4d6b4c20c7e2e859bc7219a3b1