Andrew's git / gitweb.git / diff
?
Merge branch 'rt/commentchar-fmt-merge-msg' into maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 26 Apr 2013 18:10:47 +0000 (11:10 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 26 Apr 2013 18:10:47 +0000 (11:10 -0700)
* rt/commentchar-fmt-merge-msg:
t6200: avoid path mangling issue on Windows
fmt-merge-msg: use core.commentchar in tag signatures completely
fmt-merge-msg: respect core.commentchar in people credits

1  2 
builtin/fmt-merge-msg.c patch | diff1 | diff2 | blob | history
t/t6200-fmt-merge-msg.sh patch | diff1 | diff2 | blob | history
diff --cc builtin/fmt-merge-msg.c
Simple merge
diff --cc t/t6200-fmt-merge-msg.sh
Simple merge