My Various Git Projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3fa3666 6562928)
Merge branch 'jk/diff-algo' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 28 Oct 2013 17:16:11 +0000 (10:16 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 28 Oct 2013 17:16:11 +0000 (10:16 -0700)
"git merge-recursive" did not parse its "--diff-algorithm=" command
line option correctly.

* 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
The core git plumbing