Thraix
20 lines
389 B
Lua
20 lines
389 B
Lua
local helper = {}
|
|
|
|
function helper.find_conflict()
|
|
vim.cmd("normal! /^<<<<<<<\r")
|
|
end
|
|
|
|
function helper.resolve_top()
|
|
vim.cmd("normal! /^<<<<<<<\rdd/^=======\rd/^>>>>>>>\rdd")
|
|
end
|
|
|
|
function helper.resolve_bottom()
|
|
vim.cmd("normal! /^<<<<<<<\rd/^=======\rdd/^>>>>>>>\rdd")
|
|
end
|
|
|
|
function helper.resolve_both()
|
|
vim.cmd("normal! /^<<<<<<<\rdd/^=======\rdd/^>>>>>>>\rdd")
|
|
end
|
|
|
|
return helper
|