diff options
| author | Vincent Ambo <Vincent Ambo> | 2020-01-11T23·36+0000 |
|---|---|---|
| committer | Vincent Ambo <Vincent Ambo> | 2020-01-11T23·40+0000 |
| commit | 7ef0d62730840ded097b524104cc0a0904591a63 (patch) | |
| tree | a670f96103667aeca4789a95d94ca0dff550c4ce /third_party/git/fmt-merge-msg.h | |
| parent | 6a2a3007077818e24a3d56fc492ada9206a10cf0 (diff) | |
| parent | 1b593e1ea4d2af0f6444d9a7788d5d99abd6fde5 (diff) | |
merge(third_party/git): Merge squashed git subtree at v2.23.0 r/373
Merge commit '1b593e1ea4d2af0f6444d9a7788d5d99abd6fde5' as 'third_party/git'
Diffstat (limited to 'third_party/git/fmt-merge-msg.h')
| -rw-r--r-- | third_party/git/fmt-merge-msg.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/third_party/git/fmt-merge-msg.h b/third_party/git/fmt-merge-msg.h new file mode 100644 index 000000000000..01e3aa88c50c --- /dev/null +++ b/third_party/git/fmt-merge-msg.h @@ -0,0 +1,7 @@ +#ifndef FMT_MERGE_MSG_H +#define FMT_MERGE_MSG_H + +extern int merge_log_config; +int fmt_merge_msg_config(const char *key, const char *value, void *cb); + +#endif /* FMT_MERGE_MSG_H */ |