fmt-merge-msg.hon commit am --skip: revert changes introduced by failed 3way merge (88d5072)
   1#ifndef FMT_MERGE_MSG_H
   2#define FMT_MERGE_MSG_H
   3
   4extern int merge_log_config;
   5extern int fmt_merge_msg_config(const char *key, const char *value, void *cb);
   6
   7#endif /* FMT_MERGE_MSG_H */