merge: add scissors line on merge conflict

diff --git a/builtin/difftool.c b/builtin/difftool.c
index 71318c26e177e8aa4176201e4f23e6f43b63b630..a3ea60ea71428ee59ab20a67f6e9ccf76c841f85 100644 (file)
--- a/builtin/difftool.c
+++ b/builtin/difftool.c
@@ -11,6 +11,7 @@
  *
  * Copyright (C) 2016 Johannes Schindelin
  */
+#define USE_THE_INDEX_COMPATIBILITY_MACROS
 #include "cache.h"
 #include "config.h"
 #include "builtin.h"