Results 1 to 4 of 4
  1. #1
    Join Date
    Aug 2014
    Posts
    2

    Default BC4 Mac Mergetool not working

    When I go to run mergetool I get a text compare window instead of text merge. The text compare windows is between LOCAL and REMOTE. I can't complete my merges because text compare doesn't allow you to actually merge (no merge output). Here is my .gitconfig for DT and MT:

    Code:
    [diff]
        tool = bcomp
    [difftool]
        prompt = false
    [difftool "bcomp"]
        trustExitCode = true
        cmd = "/usr/local/bin/bcomp" "$LOCAL" "$REMOTE"
    [merge]
        tool = bcomp
    [mergetool]
        prompt = false
    [mergetool "bcomp"]
        trustExitCode = true
        cmd = "/usr/local/bin/bcomp" "$LOCAL" "$REMOTE" "$BASE" "$MERGED"
    Does BC4 for mac support merging? If so, why is it not working on my mac. Thank you in advance.

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

    Default

    Hello,

    Are you registered for BC4 Standard edition? The Text Merge session type is a Pro feature:
    http://www.scootersoftware.com/shop.php?zz=kb_editions

    While in trial mode, you can go to the About dialog, and "Pro" mode is a checkbox that can be enabled or disabled to test either version.
    Aaron P Scooter Software

  3. #3
    Join Date
    Aug 2014
    Posts
    2

    Default

    Now that I think about it I probably only went with standard edition. Thank you for your help. It saved me a bunch of time.

  4. #4
    Join Date
    Oct 2007
    Location
    Madison, WI
    Posts
    11,618

    Default

    Hello,

    If you navigate to our Purchase page, you can use the Upgrade link to process an order from Std to Pro if you decide to go that route.
    Aaron P Scooter Software

Tags for this Thread

Posting Permissions

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