Use my own git diff setup
That one includes local base and remote at top. It turns diffthis off for the merged result to have proper code highlighting of result.
This commit is contained in:
parent
fd8a22c0f9
commit
00320b8a48
|
@ -107,7 +107,11 @@
|
||||||
|
|
||||||
merge = {
|
merge = {
|
||||||
ff = true;
|
ff = true;
|
||||||
tool = "nvimdiff";
|
tool = "nvimdiff4";
|
||||||
|
};
|
||||||
|
|
||||||
|
"mergetool \"nvimdiff4\"" = {
|
||||||
|
cmd = "nvim -d $LOCAL $BASE $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J' -c 'diffoff'";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue