Search found 1 match

by kevin.king
Tue May 21, 2019 5:46 pm
Forum: ExamDiff Pro
Topic: Merge buttons disabled using git mergetool
Replies: 1
Views: 4972

Merge buttons disabled using git mergetool

Hi, I'm having difficulty merging with ExamDiff Pro master edition with git. I did the setup with just git config --global merge.tool examdiff When I do a 3 way merge with conflicts using git mergetool examdiff appears to work fine showing the 3 way diff and the conflict area, however the tool bar b...