diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-12-06 23:53:41 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-12-26 22:45:12 (GMT) |
| commit | 3b8ff51b708e52e4ae2b8f266d25c187c3152820 (patch) | |
| tree | 6f26deb45ad737a1926bf7f7b7fcbf79187ba2d8 | |
| parent | b13112fa160f44fb0d795cdd992015c9f5a3d72a (diff) | |
| download | git-3b8ff51b708e52e4ae2b8f266d25c187c3152820.zip git-3b8ff51b708e52e4ae2b8f266d25c187c3152820.tar.gz git-3b8ff51b708e52e4ae2b8f266d25c187c3152820.tar.bz2 | |
merge-tree: lose unused "resolve_directories"
This option is always set; simplify.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | builtin/merge-tree.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/builtin/merge-tree.c b/builtin/merge-tree.c index b61d811..95de162 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++; |