Merge branch 'jk/diff-algo'
* jk/diff-algo: merge-recursive: fix parsing of "diff-algorithm" option
Jonathan Nieder committed
Oct 14, 2013 at 10:59 UTC
92d2afd563afca4d6b4c20c7e2e859bc7219a3b1
No changes.
* jk/diff-algo: merge-recursive: fix parsing of "diff-algorithm" option
No changes.