CODEWITHSUNDEEP
gitsublimetext2diff
PREEB
PREEB

Reputation: 1362

Sublimerge won't compare to other branch

I'm having trouble with Sublimerge and comparing to another branch. When I type ctrl+alt+d and choose "Compare to Other Branch" I get a list of garbled branches.

Garbled Branch Names

If I choose any, like master, which is the one I'd like to diff with, I get an error message.

enter image description here

Upvotes: 1

Views: 1190

Answers (2)

user1880342
user1880342

Reputation: 128

You can also try setting the "command" to the following:

"command": "{config:git_executable_path} -c color.ui=false branch"

Let me know which one works for you

Upvotes: 0

Borys
Borys

Reputation: 21

This is a predefined custom comparison which, fortunately, you can edit and make it working properly. Go to Preferences -> Package Settings -> Sublimerge -> Custom Comparisons - Default and find there "Compare to Other Branch…". Then add --color=never to the executed command, just like this:

"command": "{config:git_executable_path} branch --color=never"

this should fix your problem :)

Upvotes: 2

Related Questions