added git merge backup settings
This commit is contained in:
1 parent
4afb47e881
commit
8785247675
1 file changed
+1
@@ -17,6 +17,7 @@
|
||||
push.autoSetupRemote = true;
|
||||
pull.merge = true;
|
||||
merge.tool = "nvimdiff";
|
||||
mergetool.keepBackup = false;
|
||||
};
|
||||
|
||||
ignores = [
|
||||
|
||||
Reference in new issue
Block a user