This commit is contained in:
9seconds
2026-03-20 10:54:30 +01:00
parent 9ba6df0d1c
commit 4fbabfda2a
5 changed files with 54 additions and 0 deletions
+3
View File
@@ -0,0 +1,3 @@
# git config merge.theirs.name "Always accept theirs"
# git config merge.theirs.driver "cp %B %A"
default.pgo binary merge=theirs