![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | David Aguilar <davvid@gmail.com> | |
| Sat, 27 Mar 2010 21:58:09 +0000 (14:58 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 28 Mar 2010 16:29:12 +0000 (09:29 -0700) | ||
| commit | 42accaec0174f80c81681c4a6f896ca452ba3f76 | |
| tree | 5809f9e914e118676549432c4071a344520e8400 | tree | snapshot |
| parent | bb6ad28c23f05e1ea04e3f1c6b9b08cc070c5318 | commit | diff |
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>
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>
| git-difftool.perl | diff | blob | history | |
| t/t7800-difftool.sh | diff | blob | history |