[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

TortoiseMerge bug - Blocks ribbon options disabled for conflict resolution

From: bb <brettscomputers_at_yahoo.com>
Date: Fri, 18 Mar 2016 08:54:24 -0700 (PDT)

Perform a merge with conflicts. Edit the conflict using TortoiseMerge. Navigate to one of the conflicts in the file and note that the use left/right options in the Blocks ribbon are not available but they are available in the right-click context menu.

Also, possibly unrelated, for some reason the "Enable Edit" option in the ribbon is selected and cannot be disabled.

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=3166501

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2016-03-18 16:54:43 CET

This is an archived mail posted to the TortoiseSVN Users mailing list.