Merge branch 'cb/maint-stash-orphaned-file' into maint

diff --git a/builtin/blame.c b/builtin/blame.c
index fc1586350f94ae48e7e48a51818517b465e7a40d..4dd4c3f494042c91e2fa481314d2d8d6d61d9c43 100644 (file)
--- a/builtin/blame.c
+++ b/builtin/blame.c
@@ -1589,7 +1589,7 @@ static void emit_porcelain(struct scoreboard *sb, struct blame_entry *ent)
        strcpy(hex, sha1_to_hex(suspect->commit->object.sha1));
        printf("%s%c%d %d %d\n",
               hex,
-              ent->guilty ? ' ' : '*', // purely for debugging
+              ent->guilty ? ' ' : '*', /* purely for debugging */
               ent->s_lno + 1,
               ent->lno + 1,
               ent->num_lines);