merge-recursive: fix parsing of "diff-algorithm" option
authorJohn Keeping <john@keeping.me.uk>
Thu, 26 Sep 2013 20:02:48 +0000 (21:02 +0100)
committerJonathan Nieder <jrnieder@gmail.com>
Thu, 26 Sep 2013 20:52:16 +0000 (13:52 -0700)
commit6562928...e9ea46a3f2a7bd5a3dd500a7c149cc64
treee608b19...0401d15dfd4c3d041c78a70c1e639453copy hash to clipboard (tree)
parent0895c6d...c09045a3faeb7b652a844fc81c774631copy hash to clipboard (diff)
merge-recursive.c