52 commits

Author	SHA1	Message	Date
David Aguilar	a904392eae	difftool: add support for a difftool.prompt config variable ... difftool now supports difftool.prompt so that users do not have to pass --no-prompt or hit enter each time a diff tool is launched. The --prompt flag overrides the configuration variable. Signed-off-by: David Aguilar <davvid@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>	2009-04-07 22:19:56 -07:00
David Aguilar	f92f2038a5	difftool: add various git-difftool tests ... t7800-difftool.sh tests the various command-line flags, git-config variables, and environment settings supported by git-difftool. Signed-off-by: David Aguilar <davvid@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>	2009-04-07 22:19:56 -07:00