summaryrefslogtreecommitdiff
path: root/builtin/merge-ours.c
diff options
context:
space:
mode:
authorLibravatar Nguyễn Thái Ngọc Duy <pclouds@gmail.com>2018-06-30 11:20:26 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-08-03 10:42:55 -0700
commitf758a7f8ac443d451bd878f8c0e51e2bfd757d13 (patch)
tree02b9d56e08157fd877cff82803104bd804567434 /builtin/merge-ours.c
parentdiffcore.h: drop extern from function declaration (diff)
downloadtgif-f758a7f8ac443d451bd878f8c0e51e2bfd757d13.tar.xz
diff.h: remove extern from function declaration
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@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