Merge branch 'jk/diff-algo'
commit92d2afd563afca4d6b4c20c7e2e859bc7219a3b1
authorJonathan Nieder <jrnieder@gmail.com>
Mon, 14 Oct 2013 17:59:51 +0000 (14 10:59 -0700)
committerJonathan Nieder <jrnieder@gmail.com>
Mon, 14 Oct 2013 17:59:51 +0000 (14 10:59 -0700)
tree32ba979a8b05d24557b633addc467e7173322982
parentc5f424fd014488bd8a92b97f52bfe47823bc2128
parent6562928ae9ea46a3f2a7bd5a3dd500a7c149cc64
Merge branch 'jk/diff-algo'

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