| commit | 91fc159745eccb0830c9719642d07617c8100b41 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 27 Jun 2013 21:30:07 +0000 (27 14:30 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 27 Jun 2013 21:30:07 +0000 (27 14:30 -0700) | ||
| tree | 898838ba0c60359f43bcd32ca23cf35a2f44d0bb | treesnapshot (tar.gz zip) |
| parent | 644daa9428323ecdef08dfce589aa386bd2d97d4 | commitdiff |
| parent | e5c29097826be86e2f18139491cdf9c830c7fa3e | commitdiff |
Merge branch 'jk/add-i-custom-diff-algo'
* jk/add-i-custom-diff-algo:
add -i: add extra options at the right place in "diff" command line
add--interactive: respect diff.algorithm
* jk/add-i-custom-diff-algo:
add -i: add extra options at the right place in "diff" command line
add--interactive: respect diff.algorithm