Skip to content

Instantly share code, notes, and snippets.

Embed
What would you like to do?
mergespecfileの設定例
#
# UnityYAMLMerge fallback file
#
# Modify the next two lines if scene or prefab files should fallback
# on other that the default fallbacks listed below.
#
# %l is replaced with the path of you local version
# %r is replaced with the path of the incoming remote version
# %b is replaced with the common base version
# %d is replaced with a path where the result should be written to
# On Windows %programs% is replaced with "C:\Program Files" and "C:\Program Files (x86)" there by resulting in two entries to try out
# On OSX %programs% is replaced with "/Applications" and "$HOME/Applications" thereby resulting in two entries to try out
unity use "/Applications/p4merge.app/Contents/Resources/launchp4merge" "%b" "%r" "%l" "%d"
prefab use "/Applications/p4merge.app/Contents/Resources/launchp4merge" "%b" "%r" "%l" "%d"
* use "%programs%/p4merge.app/Contents/Resources/launchp4merge" "%b" "%r" "%l" "%d"
#
# Default fallbacks for unknown files. First tool found is used.
#
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment