revert: add "--strategy" option to choose merge strategy

diff --git a/notes.c b/notes.c
index a4f9926d4dfc8e8d4ba051714446517b9074fc05..07941b72352167fac9ce1b69f59cf377294a3c33 100644 (file)
--- a/notes.c
+++ b/notes.c
@@ -893,7 +893,7 @@ void remove_note(struct notes_tree *t, const unsigned char *object_sha1)
        assert(t->initialized);
        hashcpy(l.key_sha1, object_sha1);
        hashclr(l.val_sha1);
-       return note_tree_remove(t, t->root, 0, &l);
+       note_tree_remove(t, t->root, 0, &l);
 }
 
 const unsigned char *get_note(struct notes_tree *t,