Merge branch 'ps/difftool-dir-diff-exit-code' into HEAD

[thirdparty/git.git] / unpack-trees.h

diff --git a/unpack-trees.h b/unpack-trees.h
index 9b827c307f6d565fe6becf25839f45f81340b8ce..5867e26e17777483f3fc5df0084deb7a4dd135da 100644 (file)
--- a/unpack-trees.h
+++ b/unpack-trees.h
@@ -7,7 +7,7 @@
 #include "string-list.h"
 #include "tree-walk.h"
 
-#define MAX_UNPACK_TREES MAX_TRAVERSE_TREES
+#define MAX_UNPACK_TREES 8
 
 struct cache_entry;
 struct unpack_trees_options;