Merge buttons disabled using git mergetool
Posted: Tue May 21, 2019 5:46 pm
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 buttons for Use Left (Alt + L) are disabled. The whole merge menu is disabled. What could be causing that to happen?
When I watch the directory it creates three temporary files for LOCAL, REMOTE, & BASE.
Thanks in advance
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 buttons for Use Left (Alt + L) are disabled. The whole merge menu is disabled. What could be causing that to happen?
When I watch the directory it creates three temporary files for LOCAL, REMOTE, & BASE.
Thanks in advance