merge: remove drop_save() in favor of remove_merge_branch_state()

diff --git a/dir.c b/dir.c
index 21284482198147687fb03892265f97ac5ed58d18..b2cabadf2503b22cc10b3e47c548a5904d77158e 100644 (file)
--- a/dir.c
+++ b/dir.c
@@ -7,7 +7,6 @@
  * Copyright (C) Linus Torvalds, 2005-2006
  *              Junio Hamano, 2005-2006
  */
-#define NO_THE_INDEX_COMPATIBILITY_MACROS
 #include "cache.h"
 #include "config.h"
 #include "dir.h"