Merge branch 'nd/checkout-noisy-unmerge'

diff --git a/unpack-trees.c b/unpack-trees.c
index 01c2175f7c12f2bbfe6d24c73d32c60131fdc723..3563daae1aa6bceb4f7a4715ee574e1359622239 100644 (file)
--- a/unpack-trees.c
+++ b/unpack-trees.c
@@ -1,4 +1,3 @@
-#define NO_THE_INDEX_COMPATIBILITY_MACROS
 #include "cache.h"
 #include "argv-array.h"
 #include "repository.h"