Skip to content

Commit

Permalink
Update README.md: fixup
Browse files Browse the repository at this point in the history
  • Loading branch information
ilyagr authored Aug 4, 2024
1 parent f1c9201 commit 3efdbcc
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ learn the ways of Vim or Emacs.
### Resolving merge conflicts in a 3-pane view

This would be a compromise, see the next section for a more radical and less
feasible approach.
feasible approach, as well as alternatives.

Currently, `diffedit3` could be used to resolve conflicts by putting the file
with conflict markers in the center and the left/right sides on the sides. There
Expand Down

0 comments on commit 3efdbcc

Please sign in to comment.