Merge branch 'jk/format-patch-multiline-header'

diff --git a/pretty.c b/pretty.c
index 305ff85d744e40ce00879fd087205567c156bc51..ba95de92cd66f9ba24d84e706b013d2679ef554a 100644 (file)
--- a/pretty.c
+++ b/pretty.c
@@ -885,11 +885,7 @@ static size_t format_commit_one(struct strbuf *sb, const char *placeholder,
                                              c->abbrev_parent_hashes.off;
                return 1;
        case 'm':               /* left/right/bottom */
-               strbuf_addch(sb, (commit->object.flags & BOUNDARY)
-                                ? '-'
-                                : (commit->object.flags & SYMMETRIC_LEFT)
-                                ? '<'
-                                : '>');
+               strbuf_addstr(sb, get_revision_mark(NULL, commit));
                return 1;
        case 'd':
                format_decoration(sb, commit);