merge-recursive: Fix working copy handling for rename/rename/add/add

diff --git a/pretty.c b/pretty.c
index 0252a21a0d62dc59a9325d0365db0c0061b70eb7..7d23c1f8481af3cfd73c76c76fb2e13a2a7e4a9c 100644 (file)
--- a/pretty.c
+++ b/pretty.c
@@ -935,11 +935,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);
@@ -1079,7 +1075,7 @@ void userformat_find_requirements(const char *fmt, struct userformat_want *w)
                        return;
                fmt = user_format;
        }
-       strbuf_expand(&dummy, user_format, userformat_want_item, w);
+       strbuf_expand(&dummy, fmt, userformat_want_item, w);
        strbuf_release(&dummy);
 }