summaryrefslogtreecommitdiff
path: root/builtin/branch.c
diff options
context:
space:
mode:
authorElijah Newren <newren@gmail.com>2010-10-03 20:00:12 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-10-06 20:26:13 (GMT)
commitbc0f35ca238ff88829cd9839641a316e859348a2 (patch)
tree059cee3b66ca577462ee6d141613d42451b00619 /builtin/branch.c
parentaf7b252619fd9f73ab6a06af09e7e62838c5f54b (diff)
downloadgit-bc0f35ca238ff88829cd9839641a316e859348a2.zip
git-bc0f35ca238ff88829cd9839641a316e859348a2.tar.gz
git-bc0f35ca238ff88829cd9839641a316e859348a2.tar.bz2
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/branch.c')
0 files changed, 0 insertions, 0 deletions