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

1  2 
t/t7800-difftool.sh
Simple merge