From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 7 May 2012 20:28:44 +0000 (-0700)
Subject: Merge branch 'th/difftool-diffall'
X-Git-Tag: v1.7.11-rc0~55
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=cae097722162c852ab81c50efe8b25a84b6a5dff;p=git.git

Merge branch 'th/difftool-diffall'

Rolls the two-directory-diff logic from diffall script (in contrib/) into
"git difftool" framework.

By Tim Henigan
* th/difftool-diffall:
  difftool: print list of valid tools with '--tool-help'
  difftool: teach difftool to handle directory diffs
  difftool: eliminate setup_environment function
  difftool: stop appending '.exe' to git
  difftool: remove explicit change of PATH
  difftool: exit(0) when usage is printed
  difftool: add '--no-gui' option
  difftool: parse options using Getopt::Long
---

cae097722162c852ab81c50efe8b25a84b6a5dff