Merge branch 'js/pre-merge-commit-hook'

diff --git a/branch.h b/branch.h
index 064ee576f29764637dfdc62141973e935f8fd488..df0be61506fd36a0bfb63a911ba532b5db495767 100644 (file)
--- a/branch.h
+++ b/branch.h
@@ -70,7 +70,7 @@ void remove_merge_branch_state(struct repository *r);
  * Remove information about the state of working on the current
  * branch. (E.g., MERGE_HEAD)
  */
-void remove_branch_state(struct repository *r);
+void remove_branch_state(struct repository *r, int verbose);
 
 /*
  * Configure local branch "local" as downstream to branch "remote"