summaryrefslogtreecommitdiff
path: root/builtin/merge-recursive.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2019-10-18 11:40:48 +0900
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-10-18 11:40:48 +0900
commite5fca6b573f9d88f99f611fcbb592bdd46656a9d (patch)
tree645e06939fd0d39c627724960d69d10534d5e39e /builtin/merge-recursive.c
parentMerge branch 'bb/utf8-wcwidth-cleanup' (diff)
parentgit-compat-util: fix documentation syntax (diff)
downloadtgif-e5fca6b573f9d88f99f611fcbb592bdd46656a9d.tar.xz
Merge branch 'bb/compat-util-comment-fix'
Code cleanup. * bb/compat-util-comment-fix: git-compat-util: fix documentation syntax
Diffstat (limited to 'builtin/merge-recursive.c')
0 files changed, 0 insertions, 0 deletions