completion: use __gitcomp_builtin in _git_merge
authorNguyễn Thái Ngọc Duy <pclouds@gmail.com>
Fri, 9 Feb 2018 11:02:04 +0000 (18:02 +0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 9 Feb 2018 18:24:52 +0000 (10:24 -0800)
commit640c325...79a1ff6f23b7921c7de1023398962841
tree03be150...e77423276f6a8d05ac3ecb476ac72092copy hash to clipboard (tree)
parentcdc71c1...5dabc2da7fd8c5c64dc4a3802720fe74copy hash to clipboard (diff)
contrib/completion/git-completion.bash