mirror of
https://github.com/git/git.git
synced 2024-11-05 16:52:59 +01:00
f01de62e45
Commands using the ll_merge() function will present conflict hunks imitating ‘diff3 -m’ output if the merge.conflictstyle configuration option is set appropriately. Unlike ‘diff3 -m’, the output does not include a label for the merge base on the ||||||| line of the output, and some tools misparse the conflict hunks without that. Add a new ancestor_label parameter to ll_merge() to give callers the power to rectify this situation. If ancestor_label is NULL, the output format is unchanged. All callers pass NULL for now. Requested-by: Stefan Monnier <monnier@iro.umontreal.ca> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
17 lines
365 B
C
17 lines
365 B
C
/*
|
|
* Low level 3-way in-core file merge.
|
|
*/
|
|
|
|
#ifndef LL_MERGE_H
|
|
#define LL_MERGE_H
|
|
|
|
int ll_merge(mmbuffer_t *result_buf,
|
|
const char *path,
|
|
mmfile_t *ancestor, const char *ancestor_label,
|
|
mmfile_t *ours, const char *our_label,
|
|
mmfile_t *theirs, const char *their_label,
|
|
int flag);
|
|
|
|
int ll_merge_marker_size(const char *path);
|
|
|
|
#endif
|