Merge branch 'mg/gpg-interface-using-status' into maint
[git/jnareb-git.git] / fmt-merge-msg.h
blobb28d3a6113dc671884e95cbbc3904e4b2d26d727
1 #ifndef FMT_MERGE_MSG_H
2 #define FMT_MERGE_MSG_H
4 extern int merge_log_config;
5 extern int fmt_merge_msg_config(const char *key, const char *value, void *cb);
7 #endif /* FMT_MERGE_MSG_H */