(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:
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)
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\"
my beyond compere version is :
Version 4.2.5 (build 23088)
Comment