David Aguilar 42accaec01 difftool: Fix '--gui' when diff.guitool is unconfigured ...

When diff.guitool is unconfigured and "--gui" is specified
git-difftool dies with the following error message:

	config diff.guitool: command returned error: 1

Catch the error so that the "--gui" flag is a no-op when
diff.guitool is unconfigured.

Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

2010-03-28 09:29:12 -07:00

2.6 KiB

Executable File

Raw Blame History

View Raw