diff options
Diffstat (limited to 'src/couchdb/couch_key_tree.erl')
| -rw-r--r-- | src/couchdb/couch_key_tree.erl | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/couchdb/couch_key_tree.erl b/src/couchdb/couch_key_tree.erl index d983e20f..87313ff0 100644 --- a/src/couchdb/couch_key_tree.erl +++ b/src/couchdb/couch_key_tree.erl @@ -29,12 +29,8 @@ merge(A, B) -> {Merged, HasConflicts} = lists:foldl( fun(InsertTree, {AccTrees, AccConflicts}) -> - case merge_one(AccTrees, InsertTree, [], false) of - {ok, Merged, Conflicts} -> - {Merged, Conflicts or AccConflicts}; - no -> - {[InsertTree | AccTrees], true} - end + {ok, Merged, Conflicts} = merge_one(AccTrees, InsertTree, [], false), + {Merged, Conflicts or AccConflicts} end, {A, false}, B), if HasConflicts or |