?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
blame | history | raw | HEAD
Merge branch 'jc/dotdot-is-parent-directory' into maint-1.7.11
[git/jrn.git] / fmt-merge-msg.h
blobb28d3a6113dc671884e95cbbc3904e4b2d26d727
1 #ifndef FMT_MERGE_MSG_H
2 #define FMT_MERGE_MSG_H
3
4 extern int merge_log_config;
5 extern int fmt_merge_msg_config(const char *key, const char *value, void *cb);
6
7 #endif /* FMT_MERGE_MSG_H */
Jonathan Nieder’s miscellaneous git branches