ambroisie/nix-config
ambroisie/nix-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

home: git: use 'zdiff3' merge conflict markers

Browse source 
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
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
home/git/default.nix
View file

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