diff options
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/read-tree.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/builtin/read-tree.c b/builtin/read-tree.c index ec6d038242..9227f07ab1 100644 --- a/builtin/read-tree.c +++ b/builtin/read-tree.c @@ -229,11 +229,6 @@ int cmd_read_tree(int argc, const char **argv, const char *cmd_prefix) opts.fn = opts.prefix ? bind_merge : oneway_merge; break; case 2: - /* - * TODO: update twoway_merge to handle edit/edit conflicts in - * sparse directories. - */ - ensure_full_index(&the_index); opts.fn = twoway_merge; opts.initial_checkout = is_cache_unborn(); break; |