merge-tree: lose unused "resolve_directories"
This option is always set; simplify. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Dec 6, 2012 at 15:53 UTC
3b8ff51b708e52e4ae2b8f266d25c187c3152820
1 file changed
-3
builtin/merge-tree.c
-3
@@ -6,7 +6,6 @@
6
#include "merge-blobs.h"
7
8
static const char merge_tree_usage[] = "git merge-tree <base-tree> <branch1> <branch2>";
9
-static int resolve_directories = 1;
9
10
struct merge_list {
11
struct merge_list *next;
@@ -198,8 +197,6 @@ static int unresolved_directory(const struct traverse_info *info, struct name_en
197
struct tree_desc t[3];
198
void *buf0, *buf1, *buf2;
199
201
- if (!resolve_directories)
202
- return 0;
200
p = n;
201
if (!p->mode) {
202
p++;