Results 1 to 2 of 2
  1. #1
    Join Date
    Jul 2018
    Posts
    1

    Default Git merge on MAC don't open 3 ways merge

    (it's opened only 2-ways merge)

    I follow the instructions here :
    http://www.scootersoftware.com/suppo...?zz=kb_vcs_osx

    my git version is :
    git version 2.18.0

    my $HOME/.gitconfig:
    HTML 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\"
    I installed the command-line-tools but even when i run : "/usr/local/bin/bcomp" "a.txt" "b.txt" "c.txt" "d.txt" it's open a two ways merge ..

    my beyond compere version is :
    Version 4.2.5 (build 23088)

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

    Default

    Hello,

    If you check the About dialog box, are you registered for Standard or Pro? The Text Merge session type is a Pro specific feature. If you navigate to the Home screen, is Text Merge an available button to launch?
    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
  •