summaryrefslogtreecommitdiff
path: root/builtin/fmt-merge-msg.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2011-03-16 16:47:25 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-03-16 16:47:25 -0700
commitbd2700dbdf6551c646bc4d68b6230b63ca6eaea3 (patch)
tree3508a48d15872c36dcd7f8f864c4f5cecd00b5f9 /builtin/fmt-merge-msg.c
parentMerge branch 'js/maint-merge-use-prepare-commit-msg-hook' into maint (diff)
parentgit-patch-id: do not trip over "no newline" markers (diff)
downloadtgif-bd2700dbdf6551c646bc4d68b6230b63ca6eaea3.tar.xz
Merge branch 'mg/patch-id' into maint
* mg/patch-id: git-patch-id: do not trip over "no newline" markers git-patch-id: test for "no newline" markers
Diffstat (limited to 'builtin/fmt-merge-msg.c')
0 files changed, 0 insertions, 0 deletions