Merge branch 'th/difftool-diffall'
commitcae097722162c852ab81c50efe8b25a84b6a5dff
authorJunio C Hamano <gitster@pobox.com>
Mon, 7 May 2012 20:28:44 +0000 (7 13:28 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 7 May 2012 20:28:44 +0000 (7 13:28 -0700)
tree270ba0c48a0c8be60c307462247d802b142bd6cc
parentad799ea37589029256644d5420c1edc29821a8d2
parentbf73fc212a159210398b6d46ed5e9101c650e7db
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
t/t7800-difftool.sh