| commit | ffcb23fd59a93669f640c8936e207d440f27f70f | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 19 Mar 2013 22:57:04 +0000 (19 15:57 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 19 Mar 2013 22:57:04 +0000 (19 15:57 -0700) | ||
| tree | 2deec32501326c62ce8f47d8712ced4b3da6b018 | treesnapshot (tar.gz zip) |
| parent | 81aaed26246147ec2dbb78b312bc33a856680c31 | commitdiff |
| parent | f469e8404a625067fd3442c816771ac3ad9055ff | commitdiff |
Merge branch 'da/difftool-fixes' into next
Minor maintenance updates to difftool, and updates to its tests.
* da/difftool-fixes:
t7800: "defaults" is no longer a builtin tool name
t7800: modernize tests
t7800: update copyright notice
difftool: silence uninitialized variable warning
Minor maintenance updates to difftool, and updates to its tests.
* da/difftool-fixes:
t7800: "defaults" is no longer a builtin tool name
t7800: modernize tests
t7800: update copyright notice
difftool: silence uninitialized variable warning