tree 5809f9e914e118676549432c4071a344520e8400
parent bb6ad28c23f05e1ea04e3f1c6b9b08cc070c5318
author David Aguilar <davvid@gmail.com> 1269727089 -0700
committer Junio C Hamano <gitster@pobox.com> 1269793752 -0700

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>