]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c5f424f 6562928)
Merge branch 'jk/diff-algo'
authorJonathan Nieder <jrnieder@gmail.com>
Mon, 14 Oct 2013 17:59:51 +0000 (10:59 -0700)
committerJonathan Nieder <jrnieder@gmail.com>
Mon, 14 Oct 2013 17:59:51 +0000 (10:59 -0700)
* jk/diff-algo:
  merge-recursive: fix parsing of "diff-algorithm" option

1  2 
merge-recursive.c patch | diff1 | diff2 | blob | history

diff --cc merge-recursive.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.