Skip to content

Commit be830dc

Browse files
committed
feat(docs): add lua api
1 parent f2e866b commit be830dc

1 file changed

Lines changed: 10 additions & 0 deletions

File tree

README.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,3 +87,13 @@ the right side shows the differences between the branches.
8787
So all you need to do is edit the left side to resolve the conflicts.
8888

8989
To abort the merge, simply `:cquit`.
90+
91+
### Lua API
92+
93+
You can also use the Lua API to open the diff conflicts view:
94+
95+
```lua
96+
require("diffconflicts").show()
97+
require("diffconflicts").show_history()
98+
require("diffconflicts").show_with_history()
99+
```

0 commit comments

Comments
 (0)