diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-02-12 22:42:42 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-02-12 22:42:42 -0800 |
| commit | a7844827da8273dcf030b9313bc381da3eac011d (patch) | |
| tree | 81389bdb7fb1f90d5d4388aa6875f56cc3e0008d /merge-recursive.c | |
| parent | 75f49651a1b947e2eadd2c831b30892c0f4565c8 (diff) | |
| parent | e859c69b26528a55bd64f4eee2ed06fad999d862 (diff) | |
Merge branch 'nd/cache-tree-api-refactor'
* nd/cache-tree-api-refactor:
cache-tree: update API to take abitrary flags
Diffstat (limited to 'merge-recursive.c')
| -rw-r--r-- | merge-recursive.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/merge-recursive.c b/merge-recursive.c index d83cd6c662..6479a60cd1 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -264,7 +264,7 @@ struct tree *write_tree_from_memory(struct merge_options *o) if (!cache_tree_fully_valid(active_cache_tree) && cache_tree_update(active_cache_tree, - active_cache, active_nr, 0, 0, 0) < 0) + active_cache, active_nr, 0) < 0) die("error building trees"); result = lookup_tree(active_cache_tree->sha1); |