From: Jonathan Nieder <jrnieder@gmail.com>
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: http://git.ipfire.org/?a=commitdiff_plain;h=92d2afd563afca4d6b4c20c7e2e859bc7219a3b1;p=thirdparty%2Fgit.git

Merge branch 'jk/diff-algo'

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

92d2afd563afca4d6b4c20c7e2e859bc7219a3b1