"Compare with working copy" on a merged file from Update log uses TortoiseMerge instead of external diff viewer

The following issue seems to occur only in the specific situation
described (merged file, update log, context menu). Diffing is correctlty
delegated to my external diff viewer (WinMerge) in all other situations
that I have encountered.

Problem:

Even when an external diff viewer is configured, TortoiseMerge is used
to "Compare with working copy" when choosing this option from the
context menu of a merged file in the dialog that is shown when updating
a file or folder. This option in the context menu is bold, indicating
that it is the same operation as will be performed when double-clicking
the file. However, when double-clicking the file, the external diff
viewer is used as expected.

Expected results:

The external diff viewer should be used when choosing "Compare with
working copy" from the context menu of a merged file displayed in the
Update log.

Actual results:

TortoiseMerge is used instead.

Affected TortoiseSVN version: 1.4.4 build 9706

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Mon Aug 6 11:07:31 2007