Merge branch 'js/builtin-add-i-cmds' into maint
[git/debian.git] / fmt-merge-msg.h
blob01e3aa88c50c1994065a99515bd13f484558b553
1 #ifndef FMT_MERGE_MSG_H
2 #define FMT_MERGE_MSG_H
4 extern int merge_log_config;
5 int fmt_merge_msg_config(const char *key, const char *value, void *cb);
7 #endif /* FMT_MERGE_MSG_H */