summaryrefslogtreecommitdiff
path: root/builtin/fmt-merge-msg.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-04-12 13:41:48 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-04-12 13:41:48 -0700
commita46221e9adcf3deb88c4fc904859205bf87f784c (patch)
tree56180d9e9833d5cd96471d0eb84aa54949aa2102 /builtin/fmt-merge-msg.c
parentMerge branch 'mg/texinfo-5' into maint (diff)
parentt3200 (branch): modernize style (diff)
downloadtgif-a46221e9adcf3deb88c4fc904859205bf87f784c.tar.xz
Merge branch 'rr/test-3200-style' into maint
* rr/test-3200-style: t3200 (branch): modernize style Conflicts: t/t3200-branch.sh
Diffstat (limited to 'builtin/fmt-merge-msg.c')
0 files changed, 0 insertions, 0 deletions