Git merge on MAC don't open 3 ways merge

Collapse
X
 
  • Time
  • Show
Clear All
new posts
  • leyal
    New User
    • Jul 2018
    • 1

    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)
  • Aaron
    Team Scooter
    • Oct 2007
    • 16002

    #2
    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

    Comment

    Working...