10 ms·

Sublime Merge 2

161 points by robin_reala 6y ago

Offpics 6y ago
Why would I use sublime merge over vscode with extensions?
- benfrain 6y ago
  Speed and elegance.
- NikolaeVarius 6y ago
  Reversed the question. Why should I move to vscode when sublime exists
  - criley2 6y ago
    That's not a reversed question, it's a completely new one. It was about sublime merge not sublime text as you appear to have switched it to. Unless you're seriously suggesting that someone would stop using the Sublime Merge tool just to use vscode IDE for the sole function of git repo management. In which case, yeah, don't do that
  - pizza234 6y ago
    As I wrote in another comment, ST's development essentially halted more than an year ago. My last straw has been having to use a specialized plugin to workaround a bug that hasn't been fixed in years. There may be platform reasons not use VSC - I don't argue about those - but as things are, VSC is an immensely more polished product.
    - Nicksil 6y ago
      >As I wrote in another comment, ST's development essentially halted more than an year ago. Sublime Text development is not halted. What has given you the idea that it halted more than a year ago? >My last straw was being forced to use a plugin to fix a bug that hasn't been fixed in years. What's the bug?
      - pizza234 6y ago
        > Sublime Text development is not halted. What has given you the idea that it halted more than a year ago? (As I wrote in another comment) The typical information channels (blog, twitter, development builds page) don't say anything. I take the point that one can gather from the forum, the fact that there is ongoing development, but I think it's reasonable to be at least perplexed when a company is not active on the standard information channels, while at the same time expanding the team on a different product. > What's the bug? Files navigation panel goes out of whack, while switching between the editor and it with the keyboard; any keyboard-only user will experience it (although ST can't be used keyboard only, due to the inability to open a popup in the file panel via keyboard). Somebody opened a bug open a long time ago, and somebody else wrote a snippet (a plugin, I suppose) to use as workaround.
      - apocalyptic0n3 6y ago
        There hasn't been a stable build since October. The user is complaining about the Sublime development cycle, which is unlike most companies today. Sublime frequently goes 6-12 months without an update (Sublime Merge was a few days from 1 year between updates), but there is a lot of development happening in the background and test builds do exist. The Sublime team seems to prefers 1 big and stable update vs 12 smaller and possibly less stable updates. It has its advantages and disadvantages. Regardless, Merge is still the best Git GUI out there and this update just made it better. And Text is my favorite simple text editor out there (though I do prefer using a full IDE for actual development)
    - coldtea 6y ago
      >As I wrote in another comment, ST's development essentially halted more than an year ago. Says who? Most products don't have public releases of anything and don't give details for their internal development but once a year or once every 1.5/2 years. Sublime Text has been this way since 2010 at least, and yet, from release 1.0 we eventually got to release 3.2 (with 4.0 in behind the scenes dev). Every time and then, a new release / fix lands.
    - stephc_int13 6y ago
      They are actively working on Sublime Text 4, but I had the same impression when I checked their website. They probably don't want people to stop buying ST3 while they're waiting for ST4...
      - DashAnimal 6y ago
        Their license has changed as of last year. You no longer purchase ST3, but a license to ST for 3 years (including updating to ST4), and then freezing on that version of ST when the 3 years are up. They aren't selling software to users with ill intent.
        slightwinder 6y ago
        That seems like an aweful model. If ST4 still takes another 4-5 Years until a proper stabel, I'm basically unable to update with a licence bougth today, despite the high price?
- losvedir 6y ago
  Sublime Merge is a standalone app that isn't really all that integrated with Sublime Text, despite the name and coming from the same company. In other words, using Sublime Merge with VSCode is roughly the same as using it with Sublime Text. It's simply a great git client. I'd guess the biggest reason to use Sublime Merge over a VSCode extension is that it's a small, very fast, native app. I've used it before when wanting to, e.g., search my git history for a change I'd made (IIRC a function name I remembered but which was no longer in the codebase). It's just snappier in general than VSCode. But I use command line git rather than any VSCode integration, so for the most part that serves me well enough anyway.
- camjohnson26 6y ago
  I like to have all my git repos in one place. I use VS code for frontend and JetBrains for backend.
- nicoburns 6y ago
  The killer feature for me is almost-instant launch from the command line. I usually use the git CLI. But if I want to inspect the repository history or view a complex diff, then I can quickly run `smerge .` to get a graphical client.
eknkc 6y ago
Sublime Merge seems to want to run as a git client, fully controling the behavior. I wanted to use it as a difftool as I already am fine with the git cli. I don't think it can do it? Maybe I could not find the documentation. The thing is, I used https://www.kaleidoscopeapp.com/ https://www.kaleidoscopeapp.com/ on mac, which is just pure joy. Recently I'm trying to migrate into Windows with WSL and a decent graphical diff / merge tool is my pain point. Any suggestions (or a way to use SM via CLI)?
- paraboul 6y ago
  > I could not find the documentation. First result : https://www.sublimemerge.com/docs/command_line https://www.sublimemerge.com/docs/command_line
  - eknkc 6y ago
    Yeah I found that too but it only has a mergetool integration. No diff command listed there.
    - djohnston92 6y ago
      You can actually run smerge mergetool LEFT RIGHT and it will do a 2-way merge (effectively a diff).
- robin_reala 6y ago
  Kaleidoscope is so nice, and they even released an update last month (I’d assumed it was dead after radio silence for a year, after Black Pixel was bought.)
- dstaley 6y ago
  I've tried to find a decent modern-looking Windows diff client, and have just settled for VS Code. It's certainly not perfect, but with a few extensions (mainly Compare Folders[1]) it's a workable solution for my needs. [1] https://marketplace.visualstudio.com/items?itemName=moshfeu.compare-folders https://marketplace.visualstudio.com/items?itemName=moshfeu....
pizza234 6y ago
This actually makes me wonder which the company's plans are. Sublime Text's changelog (https://www.sublimetext.com/3 https://www.sublimetext.com/3) depicts the product as essentially abandoned, which matches my experience. On the other hand, the page linked says that the team is expanding. I'm puzzled.
- naringas 6y ago
  maybe it's pretty much feature complete? (and they seem to be focused on sublime merge) what else do you think it needs? keeping in mind that it's a text editor, not an IDE
  - pizza234 6y ago
    well, for example, on the file panel, not all the desktop events are caught. that means that you can open the pop-up menu _only_ with the mouse. then, the last time I had a look at the plugin API, again, there were significant limits in the events systems (I don't remember which; I think they were again related to the tree panel).
    - woodrowbarlow 6y ago
      they are quite active on their github issue tracker. i've posted twice about minor bugs; both bugs were fixed within a week or two.
  - ryuukk_ 6y ago
    maybe that's what people want? a fast IDE, so far every IDE on the market are bloated and slow as fuck
- Nicksil 6y ago
  >Sublime Text's changelog (https://www.sublimetext.com/3 https://www.sublimetext.com/3) depicts the product as essentially abandoned Sublime Text is not abandoned. Having a glance at Sublime Text 3's update history, as well as the forums, will alleviate any such concern. >On the other hand, the page linked says that the team is expanding. The linked article discusses Sublime Merge, a different product.
hprotagonist 6y ago
I was mildly impressed by smerge when it came out, and it looks a lot better now! I have a different porcelain which I prefer, but if i wasn't an emacs person (and thus, a magit person), i'd be willing to pay for this just like i once bought sublime text. Nice to see a native app keep chugging along.
naringas 6y ago
I really like being able to selectively hide branches, it's a cool git history exploration tool are there other git gui's which can do that? (surely there are, but I don't know them)
jameslk 6y ago
I wish there was UI that I could just point at a repository locally and get a GitHub-like view of the repository, where I can browse all the files, see their last commit date/message, click on them, and see the contents as well as history and git blame. I keep hoping someone will build a GitHub UI without having to use GitHub but for some reason every one of these Git UIs focus on just showing me the commit history and diffs. This is useful too but it's not really much different from all the other apps that do this.
- pokstad 6y ago
  Git has an included web server that covers a lot of this: https://git-scm.com/book/en/v2/Git-on-the-Server-GitWeb https://git-scm.com/book/en/v2/Git-on-the-Server-GitWeb
  - jameslk 6y ago
    Yeah kind of like this, but without having to use a browser. I guess I could wrap Electron around this, but groan.
    - arghwhat 6y ago
      > but without having to use a browser > wrap Electron around this HMMMM.
- coldtea 6y ago
  >point it at a repository locally and get a GitHub-like view of the repository, where I can browse all the files, see their last commit date/message, click on them, and see the contents as well as history and git blame You can do pretty much all of these things with Sublime Merge 2, so?
  - jameslk 6y ago
    I haven't seen something like Github's file browser in Sublime Merge. That is, where I can browse ALL the files in a particular branch, just like on Github. Maybe I haven't dug in enough if this exists.
_jordan 6y ago
What UI library does this use? Looks great. Is it a web technology?
- snazz 6y ago
  It's a custom, proprietary UI library built on Skia. It would be really cool if they released it as open-source, but it's also their competitive advantage.
  - wbond 6y ago
    Just to clarify, we use very little of Skia these days - we draw some basic primitives with it (i.e. rounded rectangles, pngs drawn to a rect) in software rendering mode only. With the new GPU renderer we don't use Skia at all.
    - snazz 6y ago
      Huh! That's really cool. I'm glad that you invested in the UI toolkit---that distinguishes Sublime products from other text editors and Git GUIs by a wide margin.
  - ben-schaaf 6y ago
    The new OpenGL rendering path actually doesn't touch Skia at all. It's pretty much custom all the way down to the system APIs.
drey08 6y ago
Does it support three-way merge? I still use BeyondCompare for this, and it's a killer feature whenever I have to rebase my PR against the latest upstream HEAD. Can't live without it, and I consider it an essential feature for a paid product.
- ben-schaaf 6y ago
  Yes it does. It gets used for resolving merge conflicts, but it can also be used as a separate tool: https://www.sublimemerge.com/docs/command_line https://www.sublimemerge.com/docs/command_line
- hprotagonist 6y ago
  I've been using kdiff3 for like 15 years by now: https://sourceforge.net/projects/kdiff3/ https://sourceforge.net/projects/kdiff3/ and still feel most at home there.
deleted 6y ago
[deleted]
thewisenerd 6y ago
Does anybody know if this, or can suggest a GUI client that supports "split-diff" similar to what GitHub offers? I tried a bunch of clients, including "Sublime Merge", but none of them seem to have what to me, seems like a better way of looking at diffs where the changes are interspersed across an entire function. ... maybe I'm not looking for the right "name"? any pointers in that direction would help as well.
- wbond 6y ago
  In Sublime Merge under Preferences > Layout you can change the Diff Layout. By default we use Auto, which switches between Inline (unified) and Side-by-side (split) based on how large the window is. You can pin it to a specific size if you prefer that style.
  - thewisenerd 6y ago
    ah! how did I miss this option! thanks :)
- rezistik 6y ago
  I'm a big fan of GitKraken https://www.gitkraken.com/ https://www.gitkraken.com/
  - pedrocx486 6y ago
    Wondering why this was downvoted, I'm also an user of GitKraken (for a while now), their diff layout and keyboard accessibility is amazing to help maximize work speed.
- phillipppp 6y ago
  Maybe Meld: http://meldmerge.org/ http://meldmerge.org/ The google search that may help would be for "merge tools".
- atestu 6y ago
  If you're on macOS, there's Kaleidoscope https://www.kaleidoscopeapp.com/ https://www.kaleidoscopeapp.com/
thiht 6y ago
The UIs developed by Sublime HQ are incredible. I so wish they would develop a database client with this level of polish.
- hnarn 6y ago
  Speaking of good database clients, I actually got my favorite from HN: https://dbeaver.io/ https://dbeaver.io/ -- it's not "sexy" but it's the best one I've used.
  - seaghost 6y ago
    Tableplus is so much better.
    - jedilance 6y ago
      How?
    - hnarn 6y ago
      Perhaps, but DBeaver is under the Apache license and TablePlus is from what I can tell proprietary software.
  - wakkaflokka 6y ago
    This is going to sound pretty shallow, but as powerful as Dbeaver is, I can't stand how it looks. I'm using DataGrip solely because of the large amount of themes available.
  - _bxg1 6y ago
    It's ugly and the GUI performs like mud on my computer. But it's free and full-featured, so it's hard to complain too much.
  - thiht 6y ago
    That's actually the opposite of what Sublime HQ produces. It's heavy, ugly, and pretty slow (it's based on Eclipse, so there's that). It might work but it's not enjoyable.
mastermojo 6y ago
Downloaded and played with this a little, and I like it so far. Theres a button in SourceTree that I like to change the lines of context 1/3/6/12/25/50/100 etc. I find myself occasionally changing this on a commit level. Is there a quick way to do this in Sublime Merge?
- mos_basik 6y ago
  Not quite what you're asking for, but you can drag the top/bottom borders of a given hunk to expose more of the context on a case-by-case basis.
  - mastermojo 6y ago
    Thanks, I was wondering if there was a way to change the default.

Sublime Merge 2

161 points by robin_reala 6y ago

Offpics 6y ago

Why would I use sublime merge over vscode with extensions?

benfrain 6y ago
Speed and elegance.
NikolaeVarius 6y ago
Reversed the question. Why should I move to vscode when sublime exists
- criley2 6y ago
  That's not a reversed question, it's a completely new one. It was about sublime merge not sublime text as you appear to have switched it to. Unless you're seriously suggesting that someone would stop using the Sublime Merge tool just to use vscode IDE for the sole function of git repo management. In which case, yeah, don't do that
- pizza234 6y ago
  As I wrote in another comment, ST's development essentially halted more than an year ago. My last straw has been having to use a specialized plugin to workaround a bug that hasn't been fixed in years. There may be platform reasons not use VSC - I don't argue about those - but as things are, VSC is an immensely more polished product.
  - Nicksil 6y ago
    >As I wrote in another comment, ST's development essentially halted more than an year ago. Sublime Text development is not halted. What has given you the idea that it halted more than a year ago? >My last straw was being forced to use a plugin to fix a bug that hasn't been fixed in years. What's the bug?
    - pizza234 6y ago
      > Sublime Text development is not halted. What has given you the idea that it halted more than a year ago? (As I wrote in another comment) The typical information channels (blog, twitter, development builds page) don't say anything. I take the point that one can gather from the forum, the fact that there is ongoing development, but I think it's reasonable to be at least perplexed when a company is not active on the standard information channels, while at the same time expanding the team on a different product. > What's the bug? Files navigation panel goes out of whack, while switching between the editor and it with the keyboard; any keyboard-only user will experience it (although ST can't be used keyboard only, due to the inability to open a popup in the file panel via keyboard). Somebody opened a bug open a long time ago, and somebody else wrote a snippet (a plugin, I suppose) to use as workaround.
    - apocalyptic0n3 6y ago
      There hasn't been a stable build since October. The user is complaining about the Sublime development cycle, which is unlike most companies today. Sublime frequently goes 6-12 months without an update (Sublime Merge was a few days from 1 year between updates), but there is a lot of development happening in the background and test builds do exist. The Sublime team seems to prefers 1 big and stable update vs 12 smaller and possibly less stable updates. It has its advantages and disadvantages. Regardless, Merge is still the best Git GUI out there and this update just made it better. And Text is my favorite simple text editor out there (though I do prefer using a full IDE for actual development)
  - coldtea 6y ago
    >As I wrote in another comment, ST's development essentially halted more than an year ago. Says who? Most products don't have public releases of anything and don't give details for their internal development but once a year or once every 1.5/2 years. Sublime Text has been this way since 2010 at least, and yet, from release 1.0 we eventually got to release 3.2 (with 4.0 in behind the scenes dev). Every time and then, a new release / fix lands.
  - stephc_int13 6y ago
    They are actively working on Sublime Text 4, but I had the same impression when I checked their website. They probably don't want people to stop buying ST3 while they're waiting for ST4...
    - DashAnimal 6y ago
      Their license has changed as of last year. You no longer purchase ST3, but a license to ST for 3 years (including updating to ST4), and then freezing on that version of ST when the 3 years are up. They aren't selling software to users with ill intent.
      - slightwinder 6y ago
        That seems like an aweful model. If ST4 still takes another 4-5 Years until a proper stabel, I'm basically unable to update with a licence bougth today, despite the high price?
losvedir 6y ago
Sublime Merge is a standalone app that isn't really all that integrated with Sublime Text, despite the name and coming from the same company. In other words, using Sublime Merge with VSCode is roughly the same as using it with Sublime Text. It's simply a great git client. I'd guess the biggest reason to use Sublime Merge over a VSCode extension is that it's a small, very fast, native app. I've used it before when wanting to, e.g., search my git history for a change I'd made (IIRC a function name I remembered but which was no longer in the codebase). It's just snappier in general than VSCode. But I use command line git rather than any VSCode integration, so for the most part that serves me well enough anyway.
camjohnson26 6y ago
I like to have all my git repos in one place. I use VS code for frontend and JetBrains for backend.
nicoburns 6y ago
The killer feature for me is almost-instant launch from the command line. I usually use the git CLI. But if I want to inspect the repository history or view a complex diff, then I can quickly run `smerge .` to get a graphical client.

eknkc 6y ago

Sublime Merge seems to want to run as a git client, fully controling the behavior. I wanted to use it as a difftool as I already am fine with the git cli. I don't think it can do it? Maybe I could not find the documentation. The thing is, I used https://www.kaleidoscopeapp.com/ https://www.kaleidoscopeapp.com/ on mac, which is just pure joy. Recently I'm trying to migrate into Windows with WSL and a decent graphical diff / merge tool is my pain point. Any suggestions (or a way to use SM via CLI)?

paraboul 6y ago
> I could not find the documentation. First result : https://www.sublimemerge.com/docs/command_line https://www.sublimemerge.com/docs/command_line
- eknkc 6y ago
  Yeah I found that too but it only has a mergetool integration. No diff command listed there.
  - djohnston92 6y ago
    You can actually run smerge mergetool LEFT RIGHT and it will do a 2-way merge (effectively a diff).
robin_reala 6y ago
Kaleidoscope is so nice, and they even released an update last month (I’d assumed it was dead after radio silence for a year, after Black Pixel was bought.)
dstaley 6y ago
I've tried to find a decent modern-looking Windows diff client, and have just settled for VS Code. It's certainly not perfect, but with a few extensions (mainly Compare Folders[1]) it's a workable solution for my needs. [1] https://marketplace.visualstudio.com/items?itemName=moshfeu.compare-folders https://marketplace.visualstudio.com/items?itemName=moshfeu....

pizza234 6y ago

This actually makes me wonder which the company's plans are. Sublime Text's changelog (https://www.sublimetext.com/3 https://www.sublimetext.com/3) depicts the product as essentially abandoned, which matches my experience. On the other hand, the page linked says that the team is expanding. I'm puzzled.

naringas 6y ago
maybe it's pretty much feature complete? (and they seem to be focused on sublime merge) what else do you think it needs? keeping in mind that it's a text editor, not an IDE
- pizza234 6y ago
  well, for example, on the file panel, not all the desktop events are caught. that means that you can open the pop-up menu _only_ with the mouse. then, the last time I had a look at the plugin API, again, there were significant limits in the events systems (I don't remember which; I think they were again related to the tree panel).
  - woodrowbarlow 6y ago
    they are quite active on their github issue tracker. i've posted twice about minor bugs; both bugs were fixed within a week or two.
- ryuukk_ 6y ago
  maybe that's what people want? a fast IDE, so far every IDE on the market are bloated and slow as fuck
Nicksil 6y ago
>Sublime Text's changelog (https://www.sublimetext.com/3 https://www.sublimetext.com/3) depicts the product as essentially abandoned Sublime Text is not abandoned. Having a glance at Sublime Text 3's update history, as well as the forums, will alleviate any such concern. >On the other hand, the page linked says that the team is expanding. The linked article discusses Sublime Merge, a different product.

hprotagonist 6y ago

I was mildly impressed by smerge when it came out, and it looks a lot better now! I have a different porcelain which I prefer, but if i wasn't an emacs person (and thus, a magit person), i'd be willing to pay for this just like i once bought sublime text. Nice to see a native app keep chugging along.

naringas 6y ago

I really like being able to selectively hide branches, it's a cool git history exploration tool are there other git gui's which can do that? (surely there are, but I don't know them)

jameslk 6y ago

I wish there was UI that I could just point at a repository locally and get a GitHub-like view of the repository, where I can browse all the files, see their last commit date/message, click on them, and see the contents as well as history and git blame. I keep hoping someone will build a GitHub UI without having to use GitHub but for some reason every one of these Git UIs focus on just showing me the commit history and diffs. This is useful too but it's not really much different from all the other apps that do this.

pokstad 6y ago
Git has an included web server that covers a lot of this: https://git-scm.com/book/en/v2/Git-on-the-Server-GitWeb https://git-scm.com/book/en/v2/Git-on-the-Server-GitWeb
- jameslk 6y ago
  Yeah kind of like this, but without having to use a browser. I guess I could wrap Electron around this, but groan.
  - arghwhat 6y ago
    > but without having to use a browser > wrap Electron around this HMMMM.
coldtea 6y ago
>point it at a repository locally and get a GitHub-like view of the repository, where I can browse all the files, see their last commit date/message, click on them, and see the contents as well as history and git blame You can do pretty much all of these things with Sublime Merge 2, so?
- jameslk 6y ago
  I haven't seen something like Github's file browser in Sublime Merge. That is, where I can browse ALL the files in a particular branch, just like on Github. Maybe I haven't dug in enough if this exists.

_jordan 6y ago

What UI library does this use? Looks great. Is it a web technology?

snazz 6y ago
It's a custom, proprietary UI library built on Skia. It would be really cool if they released it as open-source, but it's also their competitive advantage.
- wbond 6y ago
  Just to clarify, we use very little of Skia these days - we draw some basic primitives with it (i.e. rounded rectangles, pngs drawn to a rect) in software rendering mode only. With the new GPU renderer we don't use Skia at all.
  - snazz 6y ago
    Huh! That's really cool. I'm glad that you invested in the UI toolkit---that distinguishes Sublime products from other text editors and Git GUIs by a wide margin.
- ben-schaaf 6y ago
  The new OpenGL rendering path actually doesn't touch Skia at all. It's pretty much custom all the way down to the system APIs.

drey08 6y ago

Does it support three-way merge? I still use BeyondCompare for this, and it's a killer feature whenever I have to rebase my PR against the latest upstream HEAD. Can't live without it, and I consider it an essential feature for a paid product.

ben-schaaf 6y ago
Yes it does. It gets used for resolving merge conflicts, but it can also be used as a separate tool: https://www.sublimemerge.com/docs/command_line https://www.sublimemerge.com/docs/command_line
hprotagonist 6y ago
I've been using kdiff3 for like 15 years by now: https://sourceforge.net/projects/kdiff3/ https://sourceforge.net/projects/kdiff3/ and still feel most at home there.

deleted 6y ago

[deleted]

thewisenerd 6y ago

Does anybody know if this, or can suggest a GUI client that supports "split-diff" similar to what GitHub offers? I tried a bunch of clients, including "Sublime Merge", but none of them seem to have what to me, seems like a better way of looking at diffs where the changes are interspersed across an entire function. ... maybe I'm not looking for the right "name"? any pointers in that direction would help as well.

wbond 6y ago
In Sublime Merge under Preferences > Layout you can change the Diff Layout. By default we use Auto, which switches between Inline (unified) and Side-by-side (split) based on how large the window is. You can pin it to a specific size if you prefer that style.
- thewisenerd 6y ago
  ah! how did I miss this option! thanks :)
rezistik 6y ago
I'm a big fan of GitKraken https://www.gitkraken.com/ https://www.gitkraken.com/
- pedrocx486 6y ago
  Wondering why this was downvoted, I'm also an user of GitKraken (for a while now), their diff layout and keyboard accessibility is amazing to help maximize work speed.
phillipppp 6y ago
Maybe Meld: http://meldmerge.org/ http://meldmerge.org/ The google search that may help would be for "merge tools".
atestu 6y ago
If you're on macOS, there's Kaleidoscope https://www.kaleidoscopeapp.com/ https://www.kaleidoscopeapp.com/

thiht 6y ago

The UIs developed by Sublime HQ are incredible. I so wish they would develop a database client with this level of polish.

hnarn 6y ago
Speaking of good database clients, I actually got my favorite from HN: https://dbeaver.io/ https://dbeaver.io/ -- it's not "sexy" but it's the best one I've used.
- seaghost 6y ago
  Tableplus is so much better.
  - jedilance 6y ago
    How?
  - hnarn 6y ago
    Perhaps, but DBeaver is under the Apache license and TablePlus is from what I can tell proprietary software.
- wakkaflokka 6y ago
  This is going to sound pretty shallow, but as powerful as Dbeaver is, I can't stand how it looks. I'm using DataGrip solely because of the large amount of themes available.
- _bxg1 6y ago
  It's ugly and the GUI performs like mud on my computer. But it's free and full-featured, so it's hard to complain too much.
- thiht 6y ago
  That's actually the opposite of what Sublime HQ produces. It's heavy, ugly, and pretty slow (it's based on Eclipse, so there's that). It might work but it's not enjoyable.

mastermojo 6y ago

Downloaded and played with this a little, and I like it so far. Theres a button in SourceTree that I like to change the lines of context 1/3/6/12/25/50/100 etc. I find myself occasionally changing this on a commit level. Is there a quick way to do this in Sublime Merge?

mos_basik 6y ago
Not quite what you're asking for, but you can drag the top/bottom borders of a given hunk to expose more of the context on a case-by-case basis.
- mastermojo 6y ago
  Thanks, I was wondering if there was a way to change the default.