mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-06-03 12:16:16 +02:00
Code

merge-tree: lose unused "resolve_directories" 

This option is always set; simplify.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano 2012-12-06 15:53:41 -08:00
parent b13112fa16
commit 3b8ff51b70
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
builtin/merge-tree.c
View File

@ -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++;