Skip to content

Instantly share code, notes, and snippets.

@aiya000

aiya000/config

Created September 29, 2021 14:04
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save aiya000/796e4e43ef8e6e7785800542825fab7a to your computer and use it in GitHub Desktop.
Save aiya000/796e4e43ef8e6e7785800542825fab7a to your computer and use it in GitHub Desktop.
Download ZIP
Raw
config
[merge]
tool = unityyamlmerge
[mergetool "unityyamlmerge"]
trustExitCode = false
cmd = "C:\\\\Program\\ Files\\\\Unity\\\\Hub\\\\Editor\\\\2019.4.30f1\\\\Editor\\\\Data\\\\Tools\\\\UnityYAMLMerge.exe" merge -p "$BASE" "$REMOTE" "$LOCAL" "$MERGED"
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment