Merge branch 'mh/import-transport-fd-fix'

diff --git a/branch.h b/branch.h
index 6f38db14e9c496c55e204791e5ab0a5243186118..064ee576f29764637dfdc62141973e935f8fd488 100644 (file)
--- a/branch.h
+++ b/branch.h
@@ -60,6 +60,12 @@ int validate_branchname(const char *name, struct strbuf *ref);
  */
 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)