Skip to main content

Browse the archive

Revision b4eafbcdb84fc406bff37f06fdf6310aca7d0249 authored by Junio C Hamano on 21 November 2018, 13:57:44 UTC, committed by Junio C Hamano on 21 November 2018, 13:57:44 UTC 
Merge branch 'en/rerere-multi-stage-1-fix' into maint
 
A corner case bugfix in "git rerere" code.

* en/rerere-multi-stage-1-fix:
  rerere: avoid buffer overrun
  t4200: demonstrate rerere segfault on specially crafted merge
2 parent s e1372c3 + ad2bf0d
Raw File
fmt-merge-msg.h 
#ifndef FMT_MERGE_MSG_H
#define FMT_MERGE_MSG_H

extern int merge_log_config;
extern int fmt_merge_msg_config(const char *key, const char *value, void *cb);

#endif /* FMT_MERGE_MSG_H */
back to top