With the mergetool configured for git, I have manufactured a conflict, and then run 'git mergetool', and yet no matter how its configured, it is bringing up a diff, not a merge window.
Asked
Active
Viewed 45 times
1 Answers
1
The actual problem was that the Standard edition does not include the text merge functionality. So if you have this problem, you should either buy the Pro edition, or find a different merge tool. It would be better if BeyondCompare gave an error in the case where the command line is trying to do a merge, but the license is not for the Pro edition. Bringing up the diff tool in that case is really not helpful.
rrreee
- 753
- 1
- 6
- 20
-
Wow, that (the lack of a warning "this operation isn't in the free version") seems like a horrific bug... – torek Mar 19 '22 at 02:12
-
Actually the standard edition is not free. – rrreee Mar 21 '22 at 22:49
-
Huh, I think that makes it even worse, if that's possible. :-) – torek Mar 22 '22 at 05:51