summaryrefslogtreecommitdiff
path: root/builtin/merge-ours.c
diff options
context:
space:
mode:
authorLibravatar Felipe Contreras <felipe.contreras@gmail.com>2013-04-27 15:10:02 -0500
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-04-27 14:32:28 -0700
commit0afe8e9e98b0b066105e03476f7c8f4c14bc1c15 (patch)
treee46311de9ae124726ff628454f74f26ab6db480f /builtin/merge-ours.c
parentcompletion; remove unuseful comments (diff)
downloadtgif-0afe8e9e98b0b066105e03476f7c8f4c14bc1c15.tar.xz
completion: use __gitcompadd for __gitcomp_file
Like the rest of the script does; let's not access COMPREPLY directly. Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge-ours.c')
0 files changed, 0 insertions, 0 deletions