Merge branch 'bw/rebase-autostash-keep-current-branch'

diff --git a/fmt-merge-msg.h b/fmt-merge-msg.h
index b28d3a6113dc671884e95cbbc3904e4b2d26d727..01e3aa88c50c1994065a99515bd13f484558b553 100644 (file)
--- a/fmt-merge-msg.h
+++ b/fmt-merge-msg.h
@@ -2,6 +2,6 @@
 #define FMT_MERGE_MSG_H
 
 extern int merge_log_config;
-extern int fmt_merge_msg_config(const char *key, const char *value, void *cb);
+int fmt_merge_msg_config(const char *key, const char *value, void *cb);
 
 #endif /* FMT_MERGE_MSG_H */