File tree Expand file tree Collapse file tree 1 file changed +6
-3
lines changed
Expand file tree Collapse file tree 1 file changed +6
-3
lines changed Original file line number Diff line number Diff line change @@ -51,9 +51,12 @@ Vimdiff is well-suited to two-way diffs:
5151
5252Git does an admirable job of automatically resolving conflicts. We want to
5353retain all the work and resolve only the things that Git could not. That work
54- is reflected in the files containing conflict markers. Rather than editing the
55- conflict markers directly, it is better to perform a two-way diff on just the
56- "left" and "right" sides of the conflict markers by splitting them apart.
54+ is reflected in the files containing conflict markers, but it is not reflected
55+ in a two-way diff between LOCAL and REMOTE.
56+
57+ Rather than editing the conflict markers directly, it is better to perform a
58+ two-way diff on just the "left" and "right" sides of the conflict markers by
59+ splitting them apart.
5760
5861## Installation
5962
You can’t perform that action at this time.
0 commit comments