feat(git): configure nvim as mergetool
parent
8538d24ad4
commit
5e6359fc23
|
@ -28,6 +28,10 @@
|
|||
difftool.prompt = false;
|
||||
difftool.difftastic.cmd = "difft --background light \"$LOCAL\" \"$REMOTE\"";
|
||||
pager.difftool = true;
|
||||
|
||||
merge.tool = "nvim";
|
||||
mergetool.prompt = false;
|
||||
mergetool.nvim.cmd = "nvim -f -c \"Gdiffsplit!\" \"$MERGED\"";
|
||||
};
|
||||
|
||||
aliases = {
|
||||
|
|
Loading…
Reference in New Issue