summaryrefslogtreecommitdiff
path: root/merge.c
diff options
context:
space:
mode:
Diffstat (limited to 'merge.c')
-rw-r--r--merge.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/merge.c b/merge.c
index fe3efa4b24..da04fff3ba 100644
--- a/merge.c
+++ b/merge.c
@@ -1,4 +1,5 @@
#define USE_THE_REPOSITORY_VARIABLE
+#define DISABLE_SIGN_COMPARE_WARNINGS
#include "git-compat-util.h"
#include "gettext.h"