diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-06-04 09:55:44 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-06-04 09:55:44 +0900 |
| commit | c5da34c12481ff6edc3f46463cbf43efe856308e (patch) | |
| tree | 1f6be27746458c6314427a3ba264db6341288151 /sequencer.c | |
| parent | fe3bf4cb526aa85941c30b6e9104e8b0a84094c3 (diff) | |
| parent | 66f5f6dca95eda46bf02c8d06de8cb265995fd6e (diff) | |
| download | git-c5da34c12481ff6edc3f46463cbf43efe856308e.tar.gz git-c5da34c12481ff6edc3f46463cbf43efe856308e.tar.xz | |
Merge branch 'ab/c-translators-comment-style'
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 a23b948ac..924fb1d0c 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"), |