merge: remove drop_save() in favor of remove_merge_branch_state()

Both remove_branch_state() and drop_save() delete almost the same set of
files about the current merge state. The only difference is MERGE_RR but
it should also be cleaned up after a successful merge, which is what
drop_save() is for.

Make a new function that deletes all merge-related state files and use
it instead of drop_save(). This function will also be used in the next
patch that introduces --quit.

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

1 files changed, 6 insertions, 0 deletions

diff --git a/branch.h b/branch.h
index 29c1afa..c90ba9d 100644
--- a/branch.h
+++ b/branch.h
@@ -61,6 +61,12 @@ extern int validate_branchname(const char *name, struct strbuf *ref);
 extern int validate_new_branchname(const char *name, struct strbuf *ref, int force);
 
 /*
+ * Remove information about the merge state on the current
+ * branch. (E.g., MERGE_HEAD)
+ */
+void remove_merge_branch_state(struct repository *r);
+
+/*
  * Remove information about the state of working on the current
  * branch. (E.g., MERGE_HEAD)
  */