Page 2 of 2 FirstFirst 12
Results 11 to 13 of 13
  1. #11
    Join Date
    Oct 2007
    Location
    Madison, WI
    Posts
    11,908

    Default

    Eclipse and Team Explorer Everywhere (OSX):

    Under Eclipse's Preferences: Team | Team Foundation Server | Compare Tools
    Add "File Types" of * and type a "Command" of /usr/local/bin/bcomp -ro1 %1 %2

    Do not Browse to bcomp, as in OSX Eclipse (Juno) this will instead auto-populate with: "/Applications/Beyond Compare.app/Contents/MacOS/bcomp", which does not work.

    Reference: http://www.scootersoftware.com/vbull...rer-Everywhere
    Aaron P Scooter Software

  2. #12
    Join Date
    Oct 2007
    Location
    Madison, WI
    Posts
    11,908

    Default

    SmartCVS (OSX):

    1. Install Command Line Tools using Beyond Compare Menu.

    2. Open Preferences of SmartCVS and go to File Comparisons Section.

    3. Click - Add / Edit the existing comparison with pattern “*"
    Use File Pattern “*"
    Select External Comparison
    Command: /usr/local/bin/bcomp
    Arguments: ${leftFile} ${rightFile}

    4. Click Ok

    Reference: Email
    Aaron P Scooter Software

  3. #13
    Join Date
    Oct 2007
    Location
    Madison, WI
    Posts
    11,908

    Default

    Android Studio (OSX):

    1. Install Command Line Tools using the Beyond Compare menu.

    2. In ADJ, go to the main menu -> Android Studio/Preferences. Under IDE Settings, select External Diff Tools.

    3. Compare folders:
    Path to executable: /usr/local/bin/bcomp

    Compare files:
    Path to executable: /usr/local/bin/bcomp

    Merge tool:
    Path to executable: /usr/local/bin/bcomp
    Parameters: %1 %3 %2 %4

    Reference: email
    Aaron P Scooter Software

Posting Permissions

  • You may not post new threads
  • You may not post replies
  • You may not post attachments
  • You may not edit your posts
  •