We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
1 parent f2e866b commit be830dcCopy full SHA for be830dc
1 file changed
README.md
@@ -87,3 +87,13 @@ the right side shows the differences between the branches.
87
So all you need to do is edit the left side to resolve the conflicts.
88
89
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