summaryrefslogtreecommitdiff
path: root/git-difftool--helper.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-08-24 19:16:15 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-08-24 19:16:15 (GMT)
commitc43a1bede3319ee95c21e753ed53d907041f5cee (patch)
tree6a47e96aaa54ee7e9efe3f4c0ed7b8b709dfe900 /git-difftool--helper.sh
parentb0b35a6ac38a4e2532e9aa60273680a6d404c7a1 (diff)
parent2a74532412b9d87d4ad96dacbe9a31ff85f80af5 (diff)
downloadgit-c43a1bede3319ee95c21e753ed53d907041f5cee.zip
git-c43a1bede3319ee95c21e753ed53d907041f5cee.tar.gz
git-c43a1bede3319ee95c21e753ed53d907041f5cee.tar.bz2
Merge branch 'jc/maint-smart-http-race-upload-pack' into maint
* jc/maint-smart-http-race-upload-pack: get_indexed_object can return NULL if nothing is in that slot; check for it
Diffstat (limited to 'git-difftool--helper.sh')
0 files changed, 0 insertions, 0 deletions