3

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
Maroun
  • 94,125
  • 30
  • 188
  • 241

1 Answers1

1

You are most probably not using the "Professional Edition".
Three-way comparison and merging is enabled within Professional Edition only.

refer to:

caoanan
  • 554
  • 5
  • 20