fix: update merge section in git config

This commit is contained in:
Glen Goodwin 2023-11-10 00:11:11 -05:00
parent 6e84ea98e4
commit 9784f4bd54

View file

@ -10,9 +10,6 @@
userName = "Glen Goodwin";
userEmail = "glen.goodwin1992@gmail.com";
extraConfig = {
merge = {
ff = "only";
};
diff = {
algorithm = "patience";
compactionHeuristic = "true";