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 /templates | |
| parent | test-lib: fix typo in comment (diff) | |
| parent | merge-recursive: fix parsing of "diff-algorithm" option (diff) | |
| download | tgif-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 'templates')
0 files changed, 0 insertions, 0 deletions