From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 21 Mar 2013 21:02:43 +0000 (-0700)
Subject: Merge branch 'da/difftool-fixes'
X-Git-Tag: v1.8.3-rc0~202
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/98ed062a923ac4bd03f7ec13b327d51ebfc3a76a

Merge branch 'da/difftool-fixes'

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
---

98ed062a923ac4bd03f7ec13b327d51ebfc3a76a