Below is the setting in my .gitconfig, but i only see 2 panes in Araxis Merge when I merge. What's the configuration to activate 3-way merge?
[mergetool "araxis"]
path = C:\\Programs\\Tools\\Araxis\\Araxis Merge\\compare.exe
Below is the setting in my .gitconfig, but i only see 2 panes in Araxis Merge when I merge. What's the configuration to activate 3-way merge?
[mergetool "araxis"]
path = C:\\Programs\\Tools\\Araxis\\Araxis Merge\\compare.exe
Copyright © 2021 Jogjafile Inc.
You are most probably not using the "Professional Edition".
Three-way comparison and merging is enabled within Professional Edition only.
refer to: