@@ -21,17 +21,17 @@ sufficient to showcase the differences between that many versions. In addition,
21
21
the default keybindings are not well suited to moving individual changes
22
22
between that many windows.
23
23
24
- The screenshow below is an example of Vimdiff as a Git mergetool using default
24
+ The screenshot below is an example of Vimdiff as a Git mergetool using default
25
25
settings. None of the conflicts have an obvious resolution:
26
26
27
27
![ ] ( ./_utils/default-vimdiff.png )
28
28
29
29
### Editing Conflict Markers is Hard
30
30
31
31
When human intervention is needed it is rarely as simple as choosing the "left"
32
- change or the "right" change. The correct resolution often involes a mix of
32
+ change or the "right" change. The correct resolution often involves a mix of
33
33
both changes. It is difficult to manually edit a file containing Git conflict
34
- markers because the human eye isn't well- suited to spotting subtle differences,
34
+ markers because the human eye isn't well suited to spotting subtle differences,
35
35
particularly when the differences are not adjacent:
36
36
37
37
![ ] ( ./_utils/conflict-markers.png )
@@ -43,7 +43,7 @@ the resolution more clear. The merge base and history of each version of the
43
43
conflict is a useful reference to learn the intent of each conflicting change,
44
44
however those are not as useful to see in the diff.
45
45
46
- Vimdiff is well- suited to two-way diffs:
46
+ Vimdiff is well suited to two-way diffs:
47
47
48
48
![ ] ( ./_utils/vim-diffconflicts.png )
49
49
0 commit comments