| commit | 687db1fed81d7082b089fc73eab6da73b4752eda | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 25 Feb 2013 18:32:17 +0000 (25 10:32 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 25 Feb 2013 18:32:17 +0000 (25 10:32 -0800) | ||
| tree | 6b032f30cb9f278449a60cb0e63f0f301e112bea | treesnapshot (tar.gz zip) |
| parent | d83e970aa1c4999bac38c42dca8e555fef3866cc | 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