Move code to clean up after a branch change to branch.c

Signed-off-by: Daniel Barkalow <barkalow@iabervon.org>

1 files changed, 8 insertions, 0 deletions

diff --git a/branch.c b/branch.c
index 45ab820c4a..1fc8788897 100644
--- a/branch.c
+++ b/branch.c
@@ -138,3 +138,11 @@ void create_branch(const char *head,
 	if (real_ref)
 		free(real_ref);
 }
+
+void remove_branch_state(void)
+{
+	unlink(git_path("MERGE_HEAD"));
+	unlink(git_path("rr-cache/MERGE_RR"));
+	unlink(git_path("MERGE_MSG"));
+	unlink(git_path("SQUASH_MSG"));
+}