summaryrefslogtreecommitdiff
path: root/builtin/merge.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2021-07-08 13:15:02 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2021-07-08 13:15:02 -0700
commit018b85dead99d968b8e66e0ee6b74358a74015d6 (patch)
tree9cbf8ff2082c68e3177f6b67984cae8136799a83 /builtin/merge.c
parentMerge branch 'fw/complete-cmd-idx-fix' (diff)
parentgit-worktree.txt: fix typo in example path (diff)
downloadtgif-018b85dead99d968b8e66e0ee6b74358a74015d6.tar.xz
Merge branch 'ar/more-typofix'
Typofixes. * ar/more-typofix: git-worktree.txt: fix typo in example path t: fix typos in test messages blame: correct name of config option in docs
Diffstat (limited to 'builtin/merge.c')
0 files changed, 0 insertions, 0 deletions