Skip to content

Commit

Permalink
README: link to CodeMirror6 FR for three-pane merge view
Browse files Browse the repository at this point in the history
  • Loading branch information
ilyagr committed Feb 20, 2024
1 parent 720c8fc commit cce7132
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,9 @@ eventually, but currently it has a very convenient feature set for this tool.
Some alternatives to CodeMirror 5 we could consider:

- Codemirror 6 has a [merge plugin](https://github.com/codemirror/merge), but it
only supports two-pane diffs at the moment.
only supports two-pane diffs at the moment. I started a [Discourse
discussion](https://discuss.codemirror.net/t/fr-three-way-comparison-for-the-v6-merge-plugin/7879)
with a feature request for three-pane diffs.
- [`mismerge`](https://github.com/BearToCode/mismerge) is promising. It is
missing some features for now (see the issues in the repo).

Expand Down

0 comments on commit cce7132

Please sign in to comment.