diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-06-05 03:03:10 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-06-05 03:03:10 +0300 |
| commit | b19174e2f37cc696cbfded9a02c2f2fd6e93bce7 (patch) | |
| tree | a006fc1e437b51f50e904ffca1e10add88b0ede8 /sequencer.c | |
| parent | 916a33875499a230012348ecbb8efcc305142579 (diff) | |
| parent | 66f5f6dca95eda46bf02c8d06de8cb265995fd6e (diff) | |
Merge branch 'ab/c-translators-comment-style' into maint
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
Diffstat (limited to 'sequencer.c')
| -rw-r--r-- | sequencer.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sequencer.c b/sequencer.c index 4dcf9c8be0..8c72cf1614 100644 --- a/sequencer.c +++ b/sequencer.c @@ -464,7 +464,8 @@ static int do_recursive_merge(struct commit *base, struct commit *next, if (active_cache_changed && write_locked_index(&the_index, &index_lock, COMMIT_LOCK)) - /* TRANSLATORS: %s will be "revert", "cherry-pick" or + /* + * TRANSLATORS: %s will be "revert", "cherry-pick" or * "rebase -i". */ return error(_("%s: Unable to write new index file"), |