Merge branch 'sl/clean-d-ignored-fix' into maint

diff --git a/sequencer.c b/sequencer.c
index 4dcf9c8be044247c6c18a4ec2a4675d9df9953eb..8c72cf16145dc80edec90c6d4fb68811c0c65399 100644 (file)
--- 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"),