lenormf / kakmerge Goto Github PK
View Code? Open in Web Editor NEWA Kakoune-based mergetool for Git
License: The Unlicense
A Kakoune-based mergetool for Git
License: The Unlicense
Leverage the test.sh
file to ensure compatibility on various systems is achieved.
Once a release has been made (with an official semver), create an AUR package.
Sometimes you need to merge two files outside the context of a git merge - (Using pacdiff
on an Arch Linux machine to handle .pacnew
files for instance).
Right now it give the following error message:
The required environment variables exported during a merge are missing
I'm wondering if this is a use-case you intent to support?
I've configured test repo like this:
[merge]
tool = kakmerge
[mergetool "kakmerge"]
trustExitCode = true
cmd = env LOCAL=\"${LOCAL}\" BASE=\"${BASE}\" REMOTE=\"${REMOTE}\" MERGED=\"${MERGED}\" kakmerge
Invoking git mergetool
spawns no new tmux session or window.
I'm on macOS, iterm2 and tmux v3.1c
I'm running macOS 11.1 and I'm getting this error:
~/g/kakmerge on master
❯ sh test.sh
Created temporary directory: /var/folders/7w/jr1m8lhx12sfmydz5b7gklrw0000gn/T//kakmerge-test-kYntjw
Leeres Git-Repository in /private/var/folders/7w/jr1m8lhx12sfmydz5b7gklrw0000gn/T/kakmerge-test-kYntjw/.git/ initialisiert
[master (Root-Commit) 8a3fcc2] Initial commit
1 file changed, 9 insertions(+)
create mode 100644 animals.txt
Zu neuem Branch 'octodog' gewechselt
sed: 1: "animals.txt": command a expects \ followed by text
Auf Branch octodog
nichts zu committen, Arbeitsverzeichnis unverändert
Zu Branch 'master' gewechselt
sed: 1: "animals.txt": command a expects \ followed by text
Auf Branch master
nichts zu committen, Arbeitsverzeichnis unverändert
Bereits aktuell.
git config option merge.tool set to unknown tool: kakmerge
Resetting to default...
This message is displayed because 'merge.tool' is not configured.
See 'git mergetool --tool-help' or 'git help config' for more details.
'git mergetool' will now attempt to use one of the following tools:
opendiff kdiff3 tkdiff xxdiff meld tortoisemerge gvimdiff diffuse diffmerge ecmerge p4merge araxis bc codecompare smerge emerge vimdiff nvimdiff
No files need merging
Start versioning to keep track of bugs fixed and features implemented in kakmerge
itself, but also keep up with upstream changes in Kakoune.
Since this project hasn't seen any activity for over two years, I wanted to know if you would still consider pull requests against this repository. If so, then I have some ideas of how to support WezTerm and non-POSIX-compliant shells (currently the mergetool.kakmerge.cmd command fails for shells such as fish and xonsh). If not, then I'll just fork it and maintain that fork, no big deal.
When I tried it for the first time, I instinctively assumed that kakmerge-next-conflict
and kakmerge-pick
work in tandem — you jump to a conflict, select which version you prefer and jump on the next one. Currently kakmerge-pick
replaces all conflicts with the selected version, until I read README I thought I'm experiencing a bug.
Can we have kakmerge-pick
resolve one conflict and kakmerge-pick-all
resolve all conflicts?
A declarative, efficient, and flexible JavaScript library for building user interfaces.
🖖 Vue.js is a progressive, incrementally-adoptable JavaScript framework for building UI on the web.
TypeScript is a superset of JavaScript that compiles to clean JavaScript output.
An Open Source Machine Learning Framework for Everyone
The Web framework for perfectionists with deadlines.
A PHP framework for web artisans
Bring data to life with SVG, Canvas and HTML. 📊📈🎉
JavaScript (JS) is a lightweight interpreted programming language with first-class functions.
Some thing interesting about web. New door for the world.
A server is a program made to process requests and deliver data to clients.
Machine learning is a way of modeling and interpreting data that allows a piece of software to respond intelligently.
Some thing interesting about visualization, use data art
Some thing interesting about game, make everyone happy.
We are working to build community through open source technology. NB: members must have two-factor auth.
Open source projects and samples from Microsoft.
Google ❤️ Open Source for everyone.
Alibaba Open Source for everyone
Data-Driven Documents codes.
China tencent open source team.