From 2794833f8d7ec29206a22a799113dad3998367fa Mon Sep 17 00:00:00 2001
From: wolfy852 <wolfy852@hotmail.com>
Date: Tue, 8 Jan 2019 16:44:56 -0600
Subject: [PATCH] Fix improperly resolved conflicts

---
 src/command.c | 7 +++++--
 src/m_misc.c  | 1 +
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/command.c b/src/command.c
index 5678e1433..bb2ea86e6 100644
--- a/src/command.c
+++ b/src/command.c
@@ -1852,8 +1852,11 @@ static boolean CV_Command(void)
 		return true;
 	}
 
-	CV_Set(v, COM_Argv(1));
-	v->changed = 1; // now it's been changed by (presumably) the user
+	if (!(v->flags & CV_SAVE) || CV_FilterVarByVersion(v, COM_Argv(1)))
+	{
+		CV_Set(v, COM_Argv(1));
+		v->changed = 1; // now it's been changed by (presumably) the user
+	}
 	return true;
 }
 
diff --git a/src/m_misc.c b/src/m_misc.c
index 57ee5923f..0586f6e52 100644
--- a/src/m_misc.c
+++ b/src/m_misc.c
@@ -37,6 +37,7 @@
 #include "d_main.h"
 #include "m_argv.h"
 #include "i_system.h"
+#include "command.h" // cv_execversion
 
 #include "m_anigif.h"