| commit | bc0f35ca238ff88829cd9839641a316e859348a2 | |
| author | Elijah Newren <newren@gmail.com> | |
| Sun, 3 Oct 2010 20:00:12 +0000 (3 14:00 -0600) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 6 Oct 2010 20:26:13 +0000 (6 13:26 -0700) | ||
| tree | 059cee3b66ca577462ee6d141613d42451b00619 | treesnapshot (tar.gz zip) |
| parent | af7b252619fd9f73ab6a06af09e7e62838c5f54b | commitdiff |
t7800 (difftool): add missing &&
Also remove a call to 'git config --unset difftool.prompt', since that is
already unset by restore_test_defaults.
Acked-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Also remove a call to 'git config --unset difftool.prompt', since that is
already unset by restore_test_defaults.
Acked-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| t/t7800-difftool.sh | diffblobblamehistory |