diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-10-28 10:16:11 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-10-28 10:16:11 -0700 |
| commit | b28325d3ab0172063d1fbe0e735d899ae43c6fee (patch) | |
| tree | 6bdda226074cf9062438565df4f4ffcd96d7d9a5 /t/t9500-gitweb-standalone-no-errors.sh | |
| parent | 3fa366668a2cfee9abfa62701b5176acb316f169 (diff) | |
| parent | 6562928ae9ea46a3f2a7bd5a3dd500a7c149cc64 (diff) | |
| download | git-b28325d3ab0172063d1fbe0e735d899ae43c6fee.tar.gz git-b28325d3ab0172063d1fbe0e735d899ae43c6fee.tar.xz | |
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
Diffstat (limited to 't/t9500-gitweb-standalone-no-errors.sh')
0 files changed, 0 insertions, 0 deletions