From d152fb197b284096c03d4ee0295efd8e1b2071b6 Mon Sep 17 00:00:00 2001 From: 7Sageer <12210216@mail.sustech.edu.cn> Date: Sat, 5 Oct 2024 10:41:49 +0800 Subject: [PATCH] fix: remove .gitconfig --- .gitconfig | 6 ------ 1 file changed, 6 deletions(-) delete mode 100644 .gitconfig diff --git a/.gitconfig b/.gitconfig deleted file mode 100644 index 690f5b03..00000000 --- a/.gitconfig +++ /dev/null @@ -1,6 +0,0 @@ -[merge] -tool = unityyamlmerge - -[mergetool "unityyamlmerge"] -trustExitCode = false -cmd = '/home/seven7/Unity/Hub/Editor/2022.3.46f1/Editor/Data/Tools/UnityYAMLMerge' merge -p "$BASE" "$REMOTE" "$LOCAL" "$MERGED" \ No newline at end of file