From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 6 Dec 2012 23:53:41 +0000 (-0800)
Subject: merge-tree: lose unused "resolve_directories"
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3b8ff51b708e52e4ae2b8f266d25c187c3152820;p=git.git

merge-tree: lose unused "resolve_directories"

This option is always set; simplify.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/builtin/merge-tree.c b/builtin/merge-tree.c
index b61d81115..95de16226 100644
--- a/builtin/merge-tree.c
+++ b/builtin/merge-tree.c
@@ -6,7 +6,6 @@
 #include "merge-blobs.h"
 
 static const char merge_tree_usage[] = "git merge-tree <base-tree> <branch1> <branch2>";
-static int resolve_directories = 1;
 
 struct merge_list {
 	struct merge_list *next;
@@ -198,8 +197,6 @@ static int unresolved_directory(const struct traverse_info *info, struct name_en
 	struct tree_desc t[3];
 	void *buf0, *buf1, *buf2;
 
-	if (!resolve_directories)
-		return 0;
 	p = n;
 	if (!p->mode) {
 		p++;