summaryrefslogtreecommitdiff
path: root/builtin/merge.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2016-05-17 14:38:37 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-05-17 14:38:38 -0700
commit5bfc50d6fe58ec38f55efff43220dc3274b4629b (patch)
tree76e2724b2cdfa6b7b6920c5805f5755a39b0941d /builtin/merge.c
parentMerge branch 'jk/test-send-sh-x-trace-elsewhere' (diff)
parentDocumentation/git-mailinfo: fix typo (diff)
downloadtgif-5bfc50d6fe58ec38f55efff43220dc3274b4629b.tar.xz
Merge branch 'va/mailinfo-doc-typofix'
Typofix. * va/mailinfo-doc-typofix: Documentation/git-mailinfo: fix typo
Diffstat (limited to 'builtin/merge.c')
0 files changed, 0 insertions, 0 deletions