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:*
*  

  1. Resolution Note (fix version 6000.3.0a2):

    Added Beyond Compare 5 support to Yaml Merge

Add comment

Log in to post comment

All about bugs

View bugs we have successfully reproduced, and vote for the bugs you want to see fixed most urgently.