Documentation/gitprotocol-v2.txt: fix a slight inconsistency in format
[git/gitster.git] / fmt-merge-msg.h
blob99054042dc5e574b2ef1c00394331955239e0324
1 #ifndef FMT_MERGE_MSG_H
2 #define FMT_MERGE_MSG_H
4 #include "strbuf.h"
6 #define DEFAULT_MERGE_LOG_LEN 20
8 struct fmt_merge_msg_opts {
9 unsigned add_title:1,
10 credit_people:1;
11 int shortlog_len;
12 const char *into_name;
15 extern int merge_log_config;
16 int fmt_merge_msg_config(const char *key, const char *value, void *cb);
17 int fmt_merge_msg(struct strbuf *in, struct strbuf *out,
18 struct fmt_merge_msg_opts *);
21 #endif /* FMT_MERGE_MSG_H */