Show MergeWhen an auto merge fails, or when the user prefers to do a manual merge, the user can perform a visual merge of the file using the new SourceGear Diff/Merge application or another diff/merge application configured by the user in the Options dialog.
Show Merge allows the user to do a 3-way merge of the file using the configured Diff/Merge utility. Changes can be saved to the copy of the file in the working folder.
Resolve Status allows the user to specify when the merge has been completed and all server modifications have been merged into the local file. When selected, Resolve Merge Status will change the file’s status from Needs Merge to either Edited or Renegade.