Switch to the Merge Tool tab in the Options dialog.For the Diff and Merge entries, select Beyond Compare from the dropdown.Select Source Control | Subversion User Tools.Merge : overwrite the preset with: /usr/bin/bcompare %1% %2% %a% -mergeoutput=%o% -lefttitle="%4%" -righttitle="%5%" -centertitle="%3%".Diff: overwrite the preset with: /usr/bin/bcompare %1% %2% -lefttitle="%3%" -righttitle="%4%".Merge : overwrite the preset with: "C:\Program Files\Beyond Compare 4\bcomp.exe" %1% %2% %a% /mergeoutput=%o% /lefttitle="%4%" /righttitle="%5%" /centertitle="%3%". ![]()
0 Comments
Leave a Reply. |