summaryrefslogtreecommitdiff
path: root/builtin/merge.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2020-11-02 13:17:46 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-11-02 13:17:47 -0800
commitc5b2c9a8cbd743218f57db0a4f1db47aa9e99b2b (patch)
treea1bd1118c5c4d1b82e57df4413de775f7118070d /builtin/merge.c
parentMerge branch 'js/default-branch-name-part-4-minus-1' (diff)
parentMyFirstContribution: clarify asciidoc dependency (diff)
downloadtgif-c5b2c9a8cbd743218f57db0a4f1db47aa9e99b2b.tar.xz
Merge branch 'es/tutorial-mention-asciidoc-early'
Doc update. * es/tutorial-mention-asciidoc-early: MyFirstContribution: clarify asciidoc dependency
Diffstat (limited to 'builtin/merge.c')
0 files changed, 0 insertions, 0 deletions