Last active
July 1, 2019 05:48
-
-
Save ADIX7/1da2906875b22d6cc368e96e84242a91 to your computer and use it in GitHub Desktop.
Unity git settings
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
| # Unity files | |
| *.unity -text merge=unityyamlmerge diff |
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
| [merge "unityyamlmerge"] | |
| name = Unity SmartMerge (UnityYamlMerge) | |
| driver = 'c:\\Program Files\\Unity\\Hub\\Editor\\2019.1.8f1\\Editor\\Data\\Tools\\UnityYAMLMerge.exe' merge -h -p --force %O %B %A %A | |
| recursive = binary |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment