Skip to content

Commit ad8aac6

Browse files
committed
Document that only the default "diff" conflict marker style is supported
See #2
1 parent f16b14f commit ad8aac6

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

README.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@ But perhaps the best way is to [try it yourself](#test-repository).
1919
`jj-diffconflicts` requires Neovim v0.10.0 or above.
2020
It can be installed like any other Neovim plugin.
2121

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+
2225
## Usage
2326

2427
Documentation is available through `:help jj-diffconflicts`.

0 commit comments

Comments
 (0)