fix: update merge section in git config
This commit is contained in:
parent
6e84ea98e4
commit
9784f4bd54
1 changed files with 0 additions and 3 deletions
|
|
@ -10,9 +10,6 @@
|
|||
userName = "Glen Goodwin";
|
||||
userEmail = "glen.goodwin1992@gmail.com";
|
||||
extraConfig = {
|
||||
merge = {
|
||||
ff = "only";
|
||||
};
|
||||
diff = {
|
||||
algorithm = "patience";
|
||||
compactionHeuristic = "true";
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue