Merge branch 'ab/c-translators-comment-style'
authorJunio C Hamano <gitster@pobox.com>
Sun, 4 Jun 2017 00:55:44 +0000 (09:55 +0900)
committerJunio C Hamano <gitster@pobox.com>
Sun, 4 Jun 2017 00:55:44 +0000 (09:55 +0900)
Update the C style recommendation for notes for translators, as
recent versions of gettext tools can work with our style of
multi-line comments.

* ab/c-translators-comment-style:
C style: use standard style for "TRANSLATORS" comments

1  2 
Documentation/CodingGuidelines
bisect.c
builtin/blame.c
builtin/notes.c
notes-utils.c
ref-filter.c
sequencer.c
Simple merge
diff --cc bisect.c
Simple merge
diff --cc builtin/blame.c
Simple merge
diff --cc builtin/notes.c
Simple merge
diff --cc notes-utils.c
Simple merge
diff --cc ref-filter.c
Simple merge
diff --cc sequencer.c
Simple merge