nki/nix-home
1
0
Fork 0
Code Issues Pull requests 2 Packages Projects Releases Wiki Activity

Move kakoune to a full-fledged package #4

Open
nki wants to merge 42 commits from kakoune-package into master
pull from: kakoune-package
merge into: nki:master
Conversation 0 Commits 42 Files changed 35 +1 -1
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 5ff48d63c6 - Show all commits

2
home/common.nix
View file

@ -106,7 +106,7 @@
.kakrc
''}";
safe.directory = "*";
merge.conflictstyle = "diff3";
merge.conflictstyle = "zdiff3";
};
};