diff options
author | Elijah Newren <newren@gmail.com> | 2010-10-03 14:00:12 -0600 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2010-10-06 13:26:13 -0700 |
commit | bc0f35ca238ff88829cd9839641a316e859348a2 (patch) | |
tree | 059cee3b66ca577462ee6d141613d42451b00619 /builtin/read-tree.c | |
parent | af7b252619fd9f73ab6a06af09e7e62838c5f54b (diff) | |
download | git-bc0f35ca238ff88829cd9839641a316e859348a2.tar.gz git-bc0f35ca238ff88829cd9839641a316e859348a2.tar.xz |
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>
Diffstat (limited to 'builtin/read-tree.c')
0 files changed, 0 insertions, 0 deletions