We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
There was an error while loading. Please reload this page.
1 parent f16b14f commit ad8aac6Copy full SHA for ad8aac6
README.md
@@ -19,6 +19,9 @@ But perhaps the best way is to [try it yourself](#test-repository).
19
`jj-diffconflicts` requires Neovim v0.10.0 or above.
20
It can be installed like any other Neovim plugin.
21
22
+It only supports conflicts that use the (default) "diff" conflict marker style (c.f. `ui.conflict-marker-style` configuration value).
23
+If you use the "git" conflict marker style, then the [diffconflicts] plugin should be able to handle them.
24
+
25
## Usage
26
27
Documentation is available through `:help jj-diffconflicts`.
0 commit comments