Created
January 29, 2018 20:09
-
-
Save chuckleplant/6804ff90ef42e35ec95c85492eb27aef to your computer and use it in GitHub Desktop.
Unity config OSX - Windows mergetool
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
[core] | |
repositoryformatversion = 0 | |
filemode = true | |
bare = false | |
logallrefupdates = true | |
ignorecase = true | |
precomposeunicode = true | |
[remote "origin"] | |
url = https://github.com/chuckleplant/GGJ2018.git | |
fetch = +refs/heads/*:refs/remotes/origin/* | |
[lfs "https://github.com/chuckleplant/GGJ2018.git/info/lfs"] | |
access = basic | |
[branch "master"] | |
remote = origin | |
merge = refs/heads/master | |
[merge] | |
tool = unityyamlmerge | |
[mergetool "unityyamlmerge"] | |
trustExitCode = false | |
cmd = '"if [[ $OSTYPE -eq "darwin"* ]]; then ED="/Applications/Unity/Unity.app/Contents/Tools/UnityYAMLMerge"; else ED="C:\\Program Files\\Unity\\Editor\\Data\\Tools\\UnityYAMLMerge.exe"; fi; $ED"' merge -p "$BASE" "$REMOTE" "$LOCAL" "$MERGED" | |
[branch "darkness-render-pass"] | |
remote = origin | |
merge = refs/heads/darkness-render-pass |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment