@@ -21,17 +21,17 @@ sufficient to showcase the differences between that many versions. In addition,
2121the default keybindings are not well suited to moving individual changes
2222between that many windows.
2323
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
2525settings. None of the conflicts have an obvious resolution:
2626
2727![ ] ( ./_utils/default-vimdiff.png )
2828
2929### Editing Conflict Markers is Hard
3030
3131When 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
3333both 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,
3535particularly when the differences are not adjacent:
3636
3737![ ] ( ./_utils/conflict-markers.png )
@@ -43,7 +43,7 @@ the resolution more clear. The merge base and history of each version of the
4343conflict is a useful reference to learn the intent of each conflicting change,
4444however those are not as useful to see in the diff.
4545
46- Vimdiff is well- suited to two-way diffs:
46+ Vimdiff is well suited to two-way diffs:
4747
4848![ ] ( ./_utils/vim-diffconflicts.png )
4949
0 commit comments