summaryrefslogtreecommitdiff
path: root/merge-recursive.h
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2015-10-16 14:32:58 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-10-16 14:32:58 -0700
commit119ffa3351d2be06cb21e3a95e235a747fe7b783 (patch)
treeacf12ab568971c5080f00970d0203e7867964aa8 /merge-recursive.h
parentMerge branch 'es/worktree-add-cleanup' into maint (diff)
parentquote: move comment before sq_quote_buf() (diff)
downloadtgif-119ffa3351d2be06cb21e3a95e235a747fe7b783.tar.xz
Merge branch 'cc/quote-comments' into maint
A no-op code-health maintenance. * cc/quote-comments: quote: move comment before sq_quote_buf() quote: fix broken sq_quote_buf() related comment
Diffstat (limited to 'merge-recursive.h')
0 files changed, 0 insertions, 0 deletions