7 lines
219 B
INI
7 lines
219 B
INI
[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"
|