mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge.conflictstyle: choose between "merge" and "diff3 -m" styles

Browse Source 
This teaches "git merge-file" to honor merge.conflictstyle configuration
variable, whose value can be "merge" (default) or "diff3".

Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano
2008-08-29 10:49:56 -07:00
parent 387c9d4981
commit b541248467
5 changed files with 47 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
builtin-merge-file.c
View File

@ -15,6 +15,15 @@ int cmd_merge_file(int argc, const char **argv, const char *prefix)
int ret = 0, i = 0, to_stdout = 0;
int merge_level = XDL_MERGE_ZEALOUS_ALNUM;
int merge_style = 0;
int nongit;
prefix = setup_git_directory_gently(&nongit);
if (!nongit) {
/* Read the configuration file */
git_config(git_xmerge_config, NULL);
if (0 <= git_xmerge_style)
merge_style = git_xmerge_style;
}
while (argc > 4) {
if (!strcmp(argv[1], "-L") && i < 3) {