sublime_merge icon indicating copy to clipboard operation
sublime_merge copied to clipboard

Add functionality to select alternative diff algorithms

Open berkanteber opened this issue 6 years ago • 8 comments

Problem description

There are many internal and external diff algorithms where each have pros and cons. However, currently there is no way to change the diff algorithm in Sublime Merge.

Preferred solution

Git already provides 4 diff algorithms and we can select one by setting diff.algorithm. Adhering to this selection as a default and providing a way to change algorithm somewhere in the diff view would be good.

Alternatives

The alternatives would be (i) only adhering to git configuration, or (ii) only provide a way to select alternative algorithms in diff view.

berkanteber avatar Nov 07 '19 20:11 berkanteber

This would be sweet.

sharpobject avatar Sep 30 '20 12:09 sharpobject

I'd pay for this. I'd develop it for free if SM was open source.

VulumeCode avatar Feb 03 '22 11:02 VulumeCode

Any news on this? I would like to use patience as it suits my project a lot better than myers...

direc85 avatar Feb 10 '22 12:02 direc85

I would also really like to be able to use patience algorithm to avoid the preceding curly brace issue.

willrowe avatar Feb 18 '22 13:02 willrowe

Would love this!

Azeirah avatar Mar 07 '22 11:03 Azeirah

I think this is becoming more and more relevant for users. In my case, I'd like to integrate difftastic https://difftastic.wilfred.me.uk with Sublime Merge, because it's so much better than most of the current diff algorithms as it's structural, and very well executed on. It's a shame we cannot reuse it today in Sublime Merge. Seems like an area where we could let OSS tools innovate.

jvican avatar Sep 07 '22 23:09 jvican

Please, dear god, I am begging you.

estradanic avatar Nov 11 '22 18:11 estradanic

+1 for difftastic, amazing diff tool

JGJP avatar Nov 16 '22 08:11 JGJP

Hi all,

Thank you for your patience while this was implemented. This was added in Sublime Merge 2084 (and will be available in the next stable build too)! You can access this preference in the preferences dialog under Diffs > Text Diff Algorithm

As always, we'd love to hear if you have any thoughts/feedback on this feature!

Kind regards, - Dylan from Sublime HQ

dpjohnst avatar Mar 16 '23 22:03 dpjohnst

I paid a Sublime Merge license due to this feature. Thank you.

jvican avatar Aug 09 '23 00:08 jvican

When will the next release be? Waiting for this to come to stable

JGJP avatar Aug 09 '23 07:08 JGJP

When will the next release be? Waiting for this to come to stable

I recently read on the sublime forums that they want to approximately have 4 stable releases per year. So last stable release + 3 months?

Azeirah avatar Aug 09 '23 07:08 Azeirah

This was resolved in March so should be any second now I guess?

JGJP avatar Aug 09 '23 08:08 JGJP

This is released now but how do we use difftastic? The option is not there in the UI and setting it manually in the preferences doesn't seem to do anything

"diff_algorithm": "difft",

JGJP avatar Aug 24 '23 02:08 JGJP

Hi @JGJP,

We currently support selecting between the internal diff algorithms that Git supports. Support for third-party diff algorithms is something we'd really like to add, and will be working towards this in the future.

Kind regards, - Dylan from Sublime HQ

dpjohnst avatar Aug 28 '23 01:08 dpjohnst

@dpjohnst

Thanks for the update, looking forward to it

JGJP avatar Aug 28 '23 12:08 JGJP