| commit | b28325d3ab0172063d1fbe0e735d899ae43c6fee | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 28 Oct 2013 17:16:11 +0000 (28 10:16 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 28 Oct 2013 17:16:11 +0000 (28 10:16 -0700) | ||
| tree | 6bdda226074cf9062438565df4f4ffcd96d7d9a5 | treesnapshot (tar.gz zip) |
| parent | 3fa366668a2cfee9abfa62701b5176acb316f169 | commitdiff |
| parent | 6562928ae9ea46a3f2a7bd5a3dd500a7c149cc64 | commitdiff |
Merge branch 'jk/diff-algo' into maint
"git merge-recursive" did not parse its "--diff-algorithm=" command
line option correctly.
* jk/diff-algo:
merge-recursive: fix parsing of "diff-algorithm" option
"git merge-recursive" did not parse its "--diff-algorithm=" command
line option correctly.
* jk/diff-algo:
merge-recursive: fix parsing of "diff-algorithm" option
| merge-recursive.c | diff1 | diff2 | blobhistory |