From d2ed79e1d1d14acc8abb9b97cb7f055afc82cd9a Mon Sep 17 00:00:00 2001
From: nhmall <nhmall@nethack.org>
Date: Mon, 4 Feb 2019 20:52:21 -0500
Subject: [PATCH] merge conflict fix part 3

---
 src/pline.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pline.c b/src/pline.c
index 819a29d6a..6f3bfa537 100644
--- a/src/pline.c
+++ b/src/pline.c
@@ -170,7 +170,7 @@ VA_DECL(const char *, line)
         msgtyp = msgtype_type(line, no_repeat);
         if ((g.pline_flags & URGENT_MESSAGE) == 0
             && (msgtyp == MSGTYP_NOSHOW
-                || (msgtyp == MSGTYP_NOREP && !strcmp(line, prevmsg))))
+                || (msgtyp == MSGTYP_NOREP && !strcmp(line, g.prevmsg))))
             /* FIXME: we need a way to tell our caller that this message
              * was suppressed so that caller doesn't set iflags.last_msg
              * for something that hasn't been shown, otherwise a subsequent