]> granicus.if.org Git - git/commitdiff
projects / git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e3b3b73 f469e84)
Merge branch 'da/difftool-fixes'
authorJunio C Hamano <gitster@pobox.com>
Thu, 21 Mar 2013 21:02:43 +0000 (14:02 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 21 Mar 2013 21:02:44 +0000 (14:02 -0700)
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


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.