Initial commit
This commit is contained in:
@@ -0,0 +1,6 @@
|
||||
[merge]
|
||||
tool = unityyamlmerge
|
||||
|
||||
[mergetool "unityyamlmerge"]
|
||||
trustExitCode = false
|
||||
cmd = 'C:\Program Files\Unity\Hub\Editor\6000.3.15f1\Editor\Data\Tools\UnityYAMLMerge.exe' merge -p "$BASE" "$REMOTE" "$LOCAL" "$MERGED"
|
||||
Reference in New Issue
Block a user