checkout: tone down the "forked status" diagnostic messages

diff --git a/branch.c b/branch.c
index 45ab820c4a035a26e8d1035d64283a9f4b73fa75..1fc8788897a83d14fd1f0273734e9f0c294ca85f 100644 (file)
--- 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"));
+}