Configure simplified git mergetool
I still use neovim, but thanks to zdiff3 diffstyle there is no need for a 3 way diff as UI. I can use the final result as simple file instead, which I did for a long time already. But now I get rid of the unnecessary files and buffers.
This commit is contained in:
parent
9af2ee6b63
commit
7f54434d32
|
@ -135,11 +135,11 @@
|
||||||
merge = {
|
merge = {
|
||||||
ff = true;
|
ff = true;
|
||||||
conflictstyle = "zdiff3";
|
conflictstyle = "zdiff3";
|
||||||
tool = "nvimdiff4";
|
tool = "nvim";
|
||||||
};
|
};
|
||||||
|
|
||||||
"mergetool \"nvimdiff4\"" = {
|
"mergetool \"nvim\"" = {
|
||||||
cmd = "nvim -d $LOCAL $BASE $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J' -c 'diffoff'";
|
cmd = "nvim $MERGED";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue