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

diff --git a/builtin/checkout-index.c b/builtin/checkout-index.c
index a2a726ad8d8fa65d2fbcd1b111d71bad61c5cee8..1ac1cc290ed7db86d3ae42b7df2246dad1c507e3 100644 (file)
--- a/builtin/checkout-index.c
+++ b/builtin/checkout-index.c
@@ -4,6 +4,7 @@
  * Copyright (C) 2005 Linus Torvalds
  *
  */
+#define USE_THE_INDEX_COMPATIBILITY_MACROS
 #include "builtin.h"
 #include "config.h"
 #include "lockfile.h"