diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-08-29 10:49:56 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-08-30 19:41:44 -0700 |
| commit | b541248467fa47979a34e3f1c5bbe3308fbdc4d1 (patch) | |
| tree | af1b1accf5962ebb10b7422e5ec6479e78b31b66 /Documentation | |
| parent | 387c9d49815ef4b1cefda71cf27f199d9fb24083 (diff) | |
| download | git-b541248467fa47979a34e3f1c5bbe3308fbdc4d1.tar.gz git-b541248467fa47979a34e3f1c5bbe3308fbdc4d1.tar.xz | |
merge.conflictstyle: choose between "merge" and "diff3 -m" styles
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>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/config.txt | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 81f981509..8c62ba4e7 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -889,6 +889,14 @@ man.<tool>.path:: Override the path for the given tool that may be used to display help in the 'man' format. See linkgit:git-help[1]. +merge.conflictstyle:: + Specify the style in which conflicted hunks are written out to + working tree files upon merge. The default is "merge", which + shows `<<<<<<<` conflict marker, change made by one side, + `=======` marker, change made by the other side, and then + `>>>>>>>` marker. An alternate style, "diff3", adds `|||||||` + marker and the original text before `=======` marker. + mergetool.<tool>.path:: Override the path for the given tool. This is useful in case your tool is not in the PATH. |