Merge branch 'js/rebase-deprecate-preserve-merges'

diff --git a/builtin/ls-files.c b/builtin/ls-files.c
index cde87cbeeb8e8d7389c95c33ff60e6e5c39e10cd..29a8762d46eb7aa9a9b456e2564062fdbdb48a06 100644 (file)
--- a/builtin/ls-files.c
+++ b/builtin/ls-files.c
@@ -5,7 +5,6 @@
  *
  * Copyright (C) Linus Torvalds, 2005
  */
-#define NO_THE_INDEX_COMPATIBILITY_MACROS
 #include "cache.h"
 #include "repository.h"
 #include "config.h"