Skip to content

Commit

Permalink
Test
Browse files Browse the repository at this point in the history
  • Loading branch information
@RustyTake-Off
RustyTake-Off committed Jun 21, 2024
1 parent bd50d88 commit cbac054
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion winfiles/.gitconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
defaultBranch = main

[merge]
conflictStyle = diff3 # https://ductile.systems/zdiff3/ - zdiff3 brakes things for some reason
# conflictStyle = diff3 # https://ductile.systems/zdiff3/ - zdiff3 brakes things for some reason

[pull]
# ff = only
Expand Down

0 comments on commit cbac054

Please sign in to comment.