diff options
author | Elijah Newren <newren@gmail.com> | 2021-12-01 03:05:07 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2021-12-02 01:45:59 +0300 |
commit | ddfc44a898a58311392a5329687a1813d6b94779 (patch) | |
tree | b264cec304adc063f1f186bd799bebacc03edf53 /Documentation/config | |
parent | 4496526f80b3e4952036550b279eff8d1babd60a (diff) |
update documentation for new zdiff3 conflictStyle
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/config')
-rw-r--r-- | Documentation/config/merge.txt | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/Documentation/config/merge.txt b/Documentation/config/merge.txt index e27cc63944..99e83dd36e 100644 --- a/Documentation/config/merge.txt +++ b/Documentation/config/merge.txt @@ -4,7 +4,14 @@ merge.conflictStyle:: shows a `<<<<<<<` conflict marker, changes made by one side, a `=======` marker, changes made by the other side, and then a `>>>>>>>` marker. An alternate style, "diff3", adds a `|||||||` - marker and the original text before the `=======` marker. + marker and the original text before the `=======` marker. The + "merge" style tends to produce smaller conflict regions than diff3, + both because of the exclusion of the original text, and because + when a subset of lines match on the two sides they are just pulled + out of the conflict region. Another alternate style, "zdiff3", is + similar to diff3 but removes matching lines on the two sides from + the conflict region when those matching lines appear near either + the beginning or end of a conflict region. merge.defaultToUpstream:: If merge is called without any commit argument, merge the upstream |