home: git: use 'zdiff3' merge conflict markers

See GitHub's presentation about this feature [1].

[1]: https://github.blog/2022-01-24-highlights-from-git-2-35/
This commit is contained in:
Bruno BELANYI 2022-03-11 14:10:04 +01:00
parent 0af000e52e
commit e32ce32860

View file

@ -120,6 +120,10 @@ in
defaultBranch = "main";
};
merge = {
conflictStyle = "zdiff3";
};
pull = {
# Avoid useless merge commits
rebase = true;