lenormf / kakmerge

A Kakoune-based mergetool for Git

lenormf/kakmerge Issues

Still Accepting Pull Requests?
Updated a year ago
Use kakmerge for stand-alone diffs as well?
Closed 3 years ago2
git config option merge.tool set to unknown tool: kakmerge
Closed 3 years ago6
Feature request: pick only one conflict
Updated 3 years ago2
Produce an ArchLinux package
Updated 3 years ago
Release a `v1.0`
Updated 3 years ago
Implement Continuous Integration tests
Updated 3 years ago
no tmux session/window is spawned
Closed 3 years ago2