kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
22699 Commits
6 Branches
36 Tags
131 MiB
Tree: e8b4ac37d8
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from 'e8b4ac37d8'
${ noResults }
git/ll-merge.h

18 lines
365 B
Raw Normal View History Unescape

merge-recursive: split low-level merge functions out. This moves low-level merge functions out of merge-recursive.c and places them in a new separate file, ll-merge.c Signed-off-by: Junio C Hamano <gitster@pobox.com>
17 years ago
/*
* 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,
ll_merge(): add ancestor label parameter for diff3-style output 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>
15 years ago
mmfile_t *ancestor, const char *ancestor_label,
merge-recursive: split low-level merge functions out. This moves low-level merge functions out of merge-recursive.c and places them in a new separate file, ll-merge.c Signed-off-by: Junio C Hamano <gitster@pobox.com>
17 years ago
mmfile_t *ours, const char *our_label,
mmfile_t *theirs, const char *their_label,
git merge -X<option> Teach "-X <option>" command line argument to "git merge" that is passed to strategy implementations. "ours" and "theirs" autoresolution introduced by the previous commit can be asked to the recursive strategy. Signed-off-by: Avery Pennarun <apenwarr@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
15 years ago
int flag);
merge-recursive: split low-level merge functions out. This moves low-level merge functions out of merge-recursive.c and places them in a new separate file, ll-merge.c Signed-off-by: Junio C Hamano <gitster@pobox.com>
17 years ago
rerere: honor conflict-marker-size attribute Signed-off-by: Junio C Hamano <gitster@pobox.com>
15 years ago
int ll_merge_marker_size(const char *path);
merge-recursive: split low-level merge functions out. This moves low-level merge functions out of merge-recursive.c and places them in a new separate file, ll-merge.c Signed-off-by: Junio C Hamano <gitster@pobox.com>
17 years ago
#endif