Merge branch 'da/difftool-fixes'
commit98ed062a923ac4bd03f7ec13b327d51ebfc3a76a
authorJunio C Hamano <gitster@pobox.com>
Thu, 21 Mar 2013 21:02:43 +0000 (21 14:02 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 21 Mar 2013 21:02:44 +0000 (21 14:02 -0700)
tree458cead593c02c01ccf24a96c518383c1839706e
parente3b3b73c6e8d2f667ec7a083d2c44bc2a342f212
parentf469e8404a625067fd3442c816771ac3ad9055ff
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