Search Issue Tracker
Fixed
Fixed in 6000.0.53f1, 6000.1.11f1, 6000.2.0b9, 6000.3.0a2
Votes
0
Found in
2021.3.52f1
2022.3.63f1
6000.0.51f1
6000.1.7f1
6000.2.0b5
6000.3.0a1
Issue ID
UUM-109861
Regression
No
Beyond Compare 5 is not supported by Yaml Merge
*Steps to reproduce:*
# Start a project and add it to P4 version control.
# Connect to the P4 Version Control in Project Settings.
# Enable Smart Merge ([Unity - Manual: Smart merge|https://docs.unity3d.com/6000.1/Documentation/Manual/SmartMerge.html])
# Modify a file and diff it. This opens an external Diff tool - in this case the P4 diff tool.
# Close the Editor and install Beyond Compare 5.
# Reopen and Diff a modified file. It does not use BC 5.
*Actual results:* It uses the same external Diff tool as before
*Expected results:* We use Beyond Compare 5 as the diff tool
*Reproducible with versions:* 6000.2.0b5, 6000.1.7f1, 6000.0.51f1, 2022.3.63f1, 2021.3.52f1
*Not reproducible with versions:*
*Can’t test with versions:*
*Tested on (OS):*
*Notes:*
*
Add comment
All about bugs
View bugs we have successfully reproduced, and vote for the bugs you want to see fixed most urgently.
Latest issues
- [Quest] Pitch Shifter causes audio degradation on Quest 2 devices when sped up
- "GUI Error: Invalid GUILayout" and "NullReferenceException" are thrown when adding Scenes to "Scenes in Baking Set" in Adaptive Probe Volumes
- Inspector window not updating when switching GameObjects in Play Mode while having a VR headset connected
- “UnityException: GetInvalidFilenameChars” errors are thrown, and the Overlay Save Preset button becomes unusable when entering Play Mode with a shortcut while Overlay Save Preset window is opened
- "UnityException: GetName can only be called from the main thread." erors are thrown when the Shortcuts window is opened and entering Play Mode with a shortcut
Resolution Note (fix version 6000.3.0a2):
Added Beyond Compare 5 support to Yaml Merge