Treat D/F conflict entry more carefully in unpack-trees.c::threeway_merge()

diff --git a/revision.c b/revision.c
index f23c1d52269576917ac2d8347b322805daa1bac5..486393cb0835ce70f685d665b916e1b67974f184 100644 (file)
--- a/revision.c
+++ b/revision.c
@@ -486,7 +486,7 @@ static void handle_one_reflog_commit(unsigned char *sha1, void *cb_data)
                        add_pending_object(cb->all_revs, o, "");
                }
                else if (!cb->warned_bad_reflog) {
-                       warn("reflog of '%s' references pruned commits",
+                       warning("reflog of '%s' references pruned commits",
                                cb->name_for_errormsg);
                        cb->warned_bad_reflog = 1;
                }