Инструменты для работы с Git – Araxis Merge Professional v2013.4296

Сразу перейду к файлу gitconfig с настройками для арахиса :)

[diff]
        tool = p4m
        tool = kdiff3
        tool = dm
        tool = dfu
        tool = wm
        tool = ss
        tool = bc4
        tool = araxis

[difftool "p4m"]
        cmd = "p4merge.exe $LOCAL $REMOTE"

[difftool "kdiff3"]
        path = C:/Program Files/KDiff3/kdiff3.exe

[difftool "dm"]
        cmd = C:/Program\\ Files/DiffMerge/sgdm.exe $LOCAL $REMOTE

[difftool "dfu"]
        cmd = diffusew $LOCAL $REMOTE

[difftool "wm"]
        cmd = winmergeu $LOCAL $REMOTE

[difftool "ss"]
       cmd = smartsynchronize.exe $LOCAL $REMOTE

[difftool "bc4"]
        cmd = bcomp.exe $LOCAL $REMOTE

[difftool "araxis"]
        path = C:\\Program Files\\Araxis\\Araxis Merge\\compare.exe 


[difftool]
        prompt = false
        keepBackup = false
        trustExitCode = false

[merge]
        tool = p4m
        tool = kdiff3
        tool = dm
        tool = dfu
        tool = ss
        tool = bc4
        tool = araxis

[mergetool]
        prompt = false
        keepBackup = false
        keepTemporaries = false

[mergetool "p4m"]
        cmd = "p4merge.exe $BASE $LOCAL $REMOTE $MERGED"
        trustExitCode = true
 

[mergetool "kdiff3"]
       path = C:/Program Files/KDiff3/kdiff3.exe

[mergetool "dm"]
 cmd = C:/Program\\ Files/DiffMerge/sgdm.exe -merge -result=$MERGED $LOCAL $BASE $REMOTE 

[mergetool "dfu"]
        cmd = diffusew $MERGED $LOCAL $BASE $REMOTE

[mergetool "ss"]
        cmd = smartsynchronize.exe $LOCAL $REMOTE $MERGED
        trustExitCode = false

[mergetool "bc4"]
        cmd = bcomp.exe $LOCAL $REMOTE $BASE $MERGED
        trustExitCode = true

[mergetool "araxis"]
        path = C:\\Program Files\\Araxis\\Araxis Merge\\compare.exe

Теперь проверяем сравнение файлов командой

$ git difftool c258082 ffd6b37 --tool=araxis --cc test.txt



Всплыло окно сравнения



Все работает замечательно

Теперь проверяем разруливание конфликтов слияния командами

$ git merge newbranch
$ git mergetool --tool=araxis





Все работает замечательно. На этом по арахису все.