Meld for Macs(yousseb.github.io)
yousseb.github.io
Meld for Macs
https://yousseb.github.io/meld/
153 comments
It's such a pretty app, but I can't bring myself to drop $150 for it.
Eh, for how much use I get out of a merge tool, $150 is pretty meaningless for the right tool. We're talking fractions of fractions of fractions of a penny per use over many years. If it makes my life better those kinds of tooling costs aren't even worth thinking about.
That said, I haven't used the new Kaleidoscope (although I was a fan of their last version and happily used it for 8 years or so), and currently use Sublime Merge.
Edit: someone care to explain to me why this completely innocuous comment on my personal philosophy of tool value is worthy of downvoting to -2?
That said, I haven't used the new Kaleidoscope (although I was a fan of their last version and happily used it for 8 years or so), and currently use Sublime Merge.
Edit: someone care to explain to me why this completely innocuous comment on my personal philosophy of tool value is worthy of downvoting to -2?
I’m sure someone as experienced as you knows commenting about up/ down votes is explicitly against the guidelines. No worries though. No need to fret, just imagine those sad souls, and what most be going through their heads, as to find your comment offensive :)
Maybe they were pushing back against the idea of paying money, for good quality software, that provides value to your life?!? Haha, joking of course. But seriously, I agree with you. If it is a tool that I use all the time, makes my life easier, and is of good quality… I’m happy to pay up for a license.
I’ve spent way more than that on my favorite database GUI clients over the years. Money well spent, and the developers earned it. Happy to support them!
Maybe they were pushing back against the idea of paying money, for good quality software, that provides value to your life?!? Haha, joking of course. But seriously, I agree with you. If it is a tool that I use all the time, makes my life easier, and is of good quality… I’m happy to pay up for a license.
I’ve spent way more than that on my favorite database GUI clients over the years. Money well spent, and the developers earned it. Happy to support them!
> Maybe they were pushing back against the idea of paying money, for good quality software, that provides value to your life?!?
Or they realise the hubris you need to have to think 150$ to be a meaningless amount of money. It's already quite a sum at the median American salary and the USA is one of the most affluent countries from which HN readers hail.
Or they realise the hubris you need to have to think 150$ to be a meaningless amount of money. It's already quite a sum at the median American salary and the USA is one of the most affluent countries from which HN readers hail.
> Or they realise the hubris you need to have to think 150$ to be a meaningless amount of money. It's already quite a sum at the median American salary and the USA is one of the most affluent countries from which HN readers hail.
Ok, but I’m a software developer and this is a professional tool with which I do a job that makes me several hundred thousand dollars a year. I don’t know that it’s “hubris” to recognize that relative to the income this helps me create, its costs are a rounding error.
Obviously $150 is a lot of money for a lot of people making a much lower income!… but those people likely aren’t in the market for a 3-way diff & merge tool, so I can’t imagine why you’d expect a discussion of this tool to have to add a disclaimer accounting for them? This is a professional tool whose costs exist relative to the income they create for the professional who wields them. My plumber brother-in-law certainly doesn’t refuse to spend tens of thousands of dollars on the equipment he uses for his job on the basis that this would be too expensive for someone working the counter at a fast food store. Nor should he – the costs make him money, and that’s what’s important.
(indeed, compared to almost any trade you can think of, we're lucky that our tools cost so little)
Ok, but I’m a software developer and this is a professional tool with which I do a job that makes me several hundred thousand dollars a year. I don’t know that it’s “hubris” to recognize that relative to the income this helps me create, its costs are a rounding error.
Obviously $150 is a lot of money for a lot of people making a much lower income!… but those people likely aren’t in the market for a 3-way diff & merge tool, so I can’t imagine why you’d expect a discussion of this tool to have to add a disclaimer accounting for them? This is a professional tool whose costs exist relative to the income they create for the professional who wields them. My plumber brother-in-law certainly doesn’t refuse to spend tens of thousands of dollars on the equipment he uses for his job on the basis that this would be too expensive for someone working the counter at a fast food store. Nor should he – the costs make him money, and that’s what’s important.
(indeed, compared to almost any trade you can think of, we're lucky that our tools cost so little)
> Obviously $150 is a lot of money for a lot of people making a much lower income!… but those people likely aren’t in the market for a 3-way diff & merge tool
Are you suggesting students and other people earning much less than 7 figures aren't supposed to be using a basic dev tool? Unless you have a very specific meaning of "aren't in the market for a diff tool".
It's not luck: our tools cost so little because we are tool makers - I don't imagine iron smiths had trouble with expensive anvils either.
Are you suggesting students and other people earning much less than 7 figures aren't supposed to be using a basic dev tool? Unless you have a very specific meaning of "aren't in the market for a diff tool".
It's not luck: our tools cost so little because we are tool makers - I don't imagine iron smiths had trouble with expensive anvils either.
> Are you suggesting students and other people earning much less than 7 figures aren't supposed to be using a basic dev tool? Unless you have a very specific meaning of "aren't in the market for a diff tool".
What? There are plenty of free options out there – that’s why they’re not likely to be in the market for a paid tool. It requires an incredibly uncharitable reading to somehow get “students aren’t allowed to merge things” from anything I wrote.
I don’t think every tool needs to be free just because a price-sensitive part of the market exists, and I personally appreciate that there are, for what is a meaninglessly small amount of money for me, options in the market that invest in solving some of the jank that the free options bring with them. But some people aren’t doing this professionally and some people don’t notice the jank and that’s fine too – they aren’t shopping for anything better. I wasn’t either when I was a student. Free was fine enough.
> I don't imagine iron smiths had trouble with expensive anvils either.
I would suggest not looking at getting into blacksmithing, if you want to maintain this belief. Even if you don’t buy one, the raw material and fuel is a far far cry from free.
What? There are plenty of free options out there – that’s why they’re not likely to be in the market for a paid tool. It requires an incredibly uncharitable reading to somehow get “students aren’t allowed to merge things” from anything I wrote.
I don’t think every tool needs to be free just because a price-sensitive part of the market exists, and I personally appreciate that there are, for what is a meaninglessly small amount of money for me, options in the market that invest in solving some of the jank that the free options bring with them. But some people aren’t doing this professionally and some people don’t notice the jank and that’s fine too – they aren’t shopping for anything better. I wasn’t either when I was a student. Free was fine enough.
> I don't imagine iron smiths had trouble with expensive anvils either.
I would suggest not looking at getting into blacksmithing, if you want to maintain this belief. Even if you don’t buy one, the raw material and fuel is a far far cry from free.
> Obviously $150 is a lot of money for a lot of people making a much lower income!… but those people likely aren’t in the market for a 3-way diff & merge tool
You’re forgetting that even in e.g. European countries, the average salary is much, much lower than in the US, most software devs don’t get 6-figure salaries. They would definitely be in the market for such a tool, but the price is prohibitive.
You’re forgetting that even in e.g. European countries, the average salary is much, much lower than in the US, most software devs don’t get 6-figure salaries. They would definitely be in the market for such a tool, but the price is prohibitive.
Lower wages don't make the developer's home and medical insurance any cheaper. The second the devs start adjusting prices, American devs with money to spare will turn on their VPN and pay a fraction of the price. The general public does this with stuff like Netflix and YouTube Premium all the time, it's not exactly uncommon. Companies that charge less according to average wages are being nice, but that's all just a choice to make sure they're at the top of their industry. Go to the supermarket and tell the cashier that you're entitled to a lower price because you only make minimum wage, see how that works out.
If you can't afford this product then you can just not buy it. You're not entitled to every piece of professional kit, especially a tool that's basically Meld with support for pictures and Office files. It's a luxury product, hardly a necessity, just like high-end smartphones or brand soda.
Furthermore, this is a piece of Mac-only kit so if you're in the market for this tool you're probably already using high-end hardware. If you can afford Apple, you can save up for Kaleidoscope.
If you can't afford this product then you can just not buy it. You're not entitled to every piece of professional kit, especially a tool that's basically Meld with support for pictures and Office files. It's a luxury product, hardly a necessity, just like high-end smartphones or brand soda.
Furthermore, this is a piece of Mac-only kit so if you're in the market for this tool you're probably already using high-end hardware. If you can afford Apple, you can save up for Kaleidoscope.
"Go to the supermarket and tell the cashier that you're entitled to a lower price because you only make minimum wage, see how that works out."
No one in this thread (except you) said anything about being entitled.
You're fighting a straw man.
No one in this thread (except you) said anything about being entitled.
You're fighting a straw man.
> the price is prohibitive
150$ for a tool you use everyday for your job? Go ask a carpenter how much they spend on their tools, and they make a fraction of what a software developer makes.
150$ for a tool you use everyday for your job? Go ask a carpenter how much they spend on their tools, and they make a fraction of what a software developer makes.
In Italy, where I (and many other posters on HN) live, a self-employing carpenter makes _much_ more than a software developer, at least at "normal" salaries for the country.
For reference, I've used Sublime Text for many, many years and was only able to justify the 79$ (now 99$) purchase price when ST4 came out last year, after a few months of unusually low expenses at home. I would 100% not be able to casually afford it now, in a normal month, even for a tool I use daily.
And I'm not some kind of out-of-school trainee, I've been working as a dev for the past 9 years and I'm now doing devops in a somewhat well paying company.
For reference, I've used Sublime Text for many, many years and was only able to justify the 79$ (now 99$) purchase price when ST4 came out last year, after a few months of unusually low expenses at home. I would 100% not be able to casually afford it now, in a normal month, even for a tool I use daily.
And I'm not some kind of out-of-school trainee, I've been working as a dev for the past 9 years and I'm now doing devops in a somewhat well paying company.
The avantage salary for a carpenter in Italy is 16.8$. 150$ is a day and half of work before taxes. You people are crazy. You are totally disconnected for reality. I don’t know nor care if it’s a reasonable price for a piece of software but if you think it’s a small sum of money you have no idea of what the life of an average person looks like.
I wasn't trying to say that $150 is a small amount of money, I was trying to say that in other professions it is normal to spend a significant amount of money on tools, but for some reasons many developers seem to think their tools should be free.
I am not from Italy, so I can't say how much carpenters in Italy spend on their tools, but I know that when we had a carpenter work on our house in Austria, they showed up with a lot more than $150 worth of tools. Just the Hilti drill they had has a list price north of 2000€. $150 might just get you the drill serviced.
They might even pay more for software than the average programmer -- typical CAD software used for construction plans often costs 1000€ or more per seat.
Also, when comparing the salary to the cost of tools you have to consider that the salary is what's left after expenses (such as tools) have been accounted for.
I am not from Italy, so I can't say how much carpenters in Italy spend on their tools, but I know that when we had a carpenter work on our house in Austria, they showed up with a lot more than $150 worth of tools. Just the Hilti drill they had has a list price north of 2000€. $150 might just get you the drill serviced.
They might even pay more for software than the average programmer -- typical CAD software used for construction plans often costs 1000€ or more per seat.
Also, when comparing the salary to the cost of tools you have to consider that the salary is what's left after expenses (such as tools) have been accounted for.
> I don’t know nor care if it’s a reasonable price for a piece of software but if you think it’s a small sum of money you have no idea of what the life of an average person looks like.
It’s a small sum of money for me. It is obviously not a small sum of money for a Bangladeshi beggar or a Peruvian cobbler.
What, exactly, is the point of this complaint? It’s obvious that people are speaking about themselves. Some people in some nations have more money than other people in other nations — that’s the world we live in. We are all already aware of this.
What is useful about bringing this up? Should every discussion of every price of everything in the world have to list how affordable it is in each and every country on earth? Is that your idea of a realistic approach to a discussion?
It’s a small sum of money for me. It is obviously not a small sum of money for a Bangladeshi beggar or a Peruvian cobbler.
What, exactly, is the point of this complaint? It’s obvious that people are speaking about themselves. Some people in some nations have more money than other people in other nations — that’s the world we live in. We are all already aware of this.
What is useful about bringing this up? Should every discussion of every price of everything in the world have to list how affordable it is in each and every country on earth? Is that your idea of a realistic approach to a discussion?
> It’s a small sum of money for me. It is obviously not a small sum of money for a Bangladeshi beggar or a Peruvian cobbler.
The parent just explained why in Italy this would not be a small sum of money, and you’re now equating them with a beggar.
The whole point we’re trying to make is that it’s not “Bangladeshi beggars” that cannot afford this, but a large group of the intended target audience.
That can be a fair trade-off they make, but you seem to brush it off as “if you can’t afford $150 for a tool like this, obviously you’re a beggar and definitely not a software dev”, which shows a completely out of touch perspective on salaries, cost of living, exchange rate, etc of a huge portion of the modernized, western world.
The parent just explained why in Italy this would not be a small sum of money, and you’re now equating them with a beggar.
The whole point we’re trying to make is that it’s not “Bangladeshi beggars” that cannot afford this, but a large group of the intended target audience.
That can be a fair trade-off they make, but you seem to brush it off as “if you can’t afford $150 for a tool like this, obviously you’re a beggar and definitely not a software dev”, which shows a completely out of touch perspective on salaries, cost of living, exchange rate, etc of a huge portion of the modernized, western world.
“This is obviously not a small amount of money to <extreme example>” obviously does not mean “everybody to whom this is not a small amount of money is equally poor, or has an equal view of its largeness” because there is, very very obviously, a large range of incomes in this world. I shouldn’t even have to say “Italian developers are very obviously to anyone with half a brain not the same as beggars”, and yet, here we are.
I’d suggest you learn to read things charitably, instead of searching for the most unlikely and preposterous meaning you can possibly dream up in order to get mad at a post. You’ll be happier for it.
I’d suggest you learn to read things charitably, instead of searching for the most unlikely and preposterous meaning you can possibly dream up in order to get mad at a post. You’ll be happier for it.
I’m rather thinking about regular employees that have to buy it with their own salary, or have to ask their employer to buy it for them.
If you’re self employed and use it as a business expense it’s more reasonable an expense.
If you’re self employed and use it as a business expense it’s more reasonable an expense.
Well that's fine, really – they should make decisions about what tools to buy based on how much it makes them, not how much it makes me, just the same as I don't base my decisions on what tools I buy based on a hypothetical Estonian contractor's salary.
I'm not really "forgetting" anything so much as I was making a statement about myself – you'll notice the prominent "I" and "me" in "Eh, for how much use I get out of a merge tool, $150 is pretty meaningless for the right tool" and "Ok, but I’m a software developer and this is a professional tool with which I do a job that makes me several hundred thousand dollars a year." – which for some reason has prompted a bunch of "well, whatabout median American income making non-developers" and "well, whatabout underpaid European developers". I am neither of these things. Wasn't talking about them. North American saws probably aren't priced affordably for Estonian carpenters either, when it comes down to it.
I'm not really "forgetting" anything so much as I was making a statement about myself – you'll notice the prominent "I" and "me" in "Eh, for how much use I get out of a merge tool, $150 is pretty meaningless for the right tool" and "Ok, but I’m a software developer and this is a professional tool with which I do a job that makes me several hundred thousand dollars a year." – which for some reason has prompted a bunch of "well, whatabout median American income making non-developers" and "well, whatabout underpaid European developers". I am neither of these things. Wasn't talking about them. North American saws probably aren't priced affordably for Estonian carpenters either, when it comes down to it.
Then why are you complaining about being downvoted? Because you are not writing for yourself but for the HN readership and the HN readership most definitely includes the people you pretend not to be "forgetting" but actually are.
> Then why are you complaining about being downvoted?
Because downvoting isn’t discussion, it’s a lazy way of dismissing something instead of taking a real position around whatever it is you disagree with.
> Because you are not writing for yourself but for the HN readership and the HN readership most definitely includes the people you pretend not to be "forgetting" but actually are.
Do you honestly think that “every post must include and add a disclaimer accounting for every possible perspective of every possible reader anywhere on Planet Earth” is a reasonable expectation to have for this, or any, conversation forum?
Should every discussion of, say, Spotify mostly focus on how unaffordable it is the population of Burundi, rather than trusting reasonable readers to understand that people are speaking to their own experiences rather than trying to make universal claims about the entire globe?
I’m seriously asking, because it seems like an absurd expectation to me.
Because downvoting isn’t discussion, it’s a lazy way of dismissing something instead of taking a real position around whatever it is you disagree with.
> Because you are not writing for yourself but for the HN readership and the HN readership most definitely includes the people you pretend not to be "forgetting" but actually are.
Do you honestly think that “every post must include and add a disclaimer accounting for every possible perspective of every possible reader anywhere on Planet Earth” is a reasonable expectation to have for this, or any, conversation forum?
Should every discussion of, say, Spotify mostly focus on how unaffordable it is the population of Burundi, rather than trusting reasonable readers to understand that people are speaking to their own experiences rather than trying to make universal claims about the entire globe?
I’m seriously asking, because it seems like an absurd expectation to me.
> I’m seriously asking, because it seems like an absurd expectation to me.
If you purposefully push it to absurde length, obviously it becomes an absurd expectation.
No one is asking you to disclaim everything you write. I am just pointing to you that if you can't be bothered to think about how what you write is going to be received, you shouldn't be surprised to be downvoted. You seem surprised that people don't care about what things mean to you when you communicate whereas it should be obvious. You are not writing for you after all but to be read.
If you purposefully push it to absurde length, obviously it becomes an absurd expectation.
No one is asking you to disclaim everything you write. I am just pointing to you that if you can't be bothered to think about how what you write is going to be received, you shouldn't be surprised to be downvoted. You seem surprised that people don't care about what things mean to you when you communicate whereas it should be obvious. You are not writing for you after all but to be read.
> No one is asking you to disclaim everything you write.
Oh? No? Then why did you write:
> Or they realise the hubris you need to have to think 150$ to be a meaningless amount of money.
What is the hubris if not that there’s somebody, somewhere for whom it’s a lot of money that I failed to add enough disclaimers about for your tastes?
I was clearing talking about $150’s value to me relative to my own personal income, so you clearly felt like that needed to come with some disclaimer about Italian developers, for some reason, despite me living half a planet away from Italy and never having said anything about anyone other than I, myself, and me.
What seems like the real hubris here is yours — your insistence that everybody else’s personal opinion on what’s a lot of money to them personally MUST make space for the chip you have on your shoulder.
> You seem surprised that people don't care about what things mean to you when you communicate whereas it should be obvious. You are not writing for you after all but to be read.
While I am writing to be read, I am expecting an audience that speaks English well enough to understand that “I” and “me” refers to, well, me, and logical and mature enough to understand that a statement written by me and about me quite obviously has nothing whatsoever to do with the income of people halfway across the planet – it’s just spectacularly and completely irrelevant to anything I wrote about how much the cost of the tool impacts me personally.
I seriously doubt that Italian developers consider less than 0.06% of their income “a lot of money” either, for what it’s worth. If you make $50,000, do you consider $30 “a lot of money”? Because that’s the scale of what I’m talking about here.
And sure, $30 is probably still a lot of money to someone somewhere else; but do you also go shout at teenagers in GameStop the next time they refer to a $30 video game as “cheap”? Seems like foolish and irrelevant behaviour, to me. Somebody’s cheap will always be someone else’s expensive.
Oh? No? Then why did you write:
> Or they realise the hubris you need to have to think 150$ to be a meaningless amount of money.
What is the hubris if not that there’s somebody, somewhere for whom it’s a lot of money that I failed to add enough disclaimers about for your tastes?
I was clearing talking about $150’s value to me relative to my own personal income, so you clearly felt like that needed to come with some disclaimer about Italian developers, for some reason, despite me living half a planet away from Italy and never having said anything about anyone other than I, myself, and me.
What seems like the real hubris here is yours — your insistence that everybody else’s personal opinion on what’s a lot of money to them personally MUST make space for the chip you have on your shoulder.
> You seem surprised that people don't care about what things mean to you when you communicate whereas it should be obvious. You are not writing for you after all but to be read.
While I am writing to be read, I am expecting an audience that speaks English well enough to understand that “I” and “me” refers to, well, me, and logical and mature enough to understand that a statement written by me and about me quite obviously has nothing whatsoever to do with the income of people halfway across the planet – it’s just spectacularly and completely irrelevant to anything I wrote about how much the cost of the tool impacts me personally.
I seriously doubt that Italian developers consider less than 0.06% of their income “a lot of money” either, for what it’s worth. If you make $50,000, do you consider $30 “a lot of money”? Because that’s the scale of what I’m talking about here.
And sure, $30 is probably still a lot of money to someone somewhere else; but do you also go shout at teenagers in GameStop the next time they refer to a $30 video game as “cheap”? Seems like foolish and irrelevant behaviour, to me. Somebody’s cheap will always be someone else’s expensive.
> Or they realise the hubris you need to have to think 150$ to be a meaningless amount of money.
I didn’t read it that way at all, and still don’t after the interpretation surprised me enough to re-read it several times. They clearly said it’s insignificant relative to the value they get from it.
I don’t think the suggestion was that everyone should reach the same conclusion in their own cost/benefit analysis, or that the sum itself is insignificant. Just that they value it enough to dismiss the cost to them.
Several of us have invested gob knows how many thousands of dollars into tools we value for the productivity they afford. I could certainly make a decent living on a low spec computer in whatever form factor is most economical at the time, but I spent significantly more because I’m more effective with tools that better fit my workflow. But those lower spec options are available for people with less budget flexibility or more budget sensitivity.
Likewise, Kaleidoscope and other high cost software is prohibitively expensive for some and absolutely worth every fractional unit of currency to others. I own a Kaleidoscope license and don’t regret it. There are countless softwares across pretty much the entire range of license pricing that I’d pass on because they’re either not valuable to me or not valuable enough to justify the price.
I didn’t read it that way at all, and still don’t after the interpretation surprised me enough to re-read it several times. They clearly said it’s insignificant relative to the value they get from it.
I don’t think the suggestion was that everyone should reach the same conclusion in their own cost/benefit analysis, or that the sum itself is insignificant. Just that they value it enough to dismiss the cost to them.
Several of us have invested gob knows how many thousands of dollars into tools we value for the productivity they afford. I could certainly make a decent living on a low spec computer in whatever form factor is most economical at the time, but I spent significantly more because I’m more effective with tools that better fit my workflow. But those lower spec options are available for people with less budget flexibility or more budget sensitivity.
Likewise, Kaleidoscope and other high cost software is prohibitively expensive for some and absolutely worth every fractional unit of currency to others. I own a Kaleidoscope license and don’t regret it. There are countless softwares across pretty much the entire range of license pricing that I’d pass on because they’re either not valuable to me or not valuable enough to justify the price.
I don't get it. I make a lot less than your average SV software dev but even I understand that goog software that makes you productive is worth investing in.
Take Jetbrains' software: I happily pay for that every year and it's 100% worth it. I could stop paying and use the fallback licence the rest of my lifr but I use the newer features and support often enough that I want to invest.
I've never used the tool in question but from what I can see it does a whole of a lot more than Meld or even Jetbrains' merge tool. It supports diffing a wild range of file formats that makes it useful for programmers but also helps out when cloud sync runs into conflicts.
Good tools often cost money. A carpenter doesn't buy value brand hardware for their most important tools and while a developer has the advantage of access to open source, paying for good tools shouldn't be controversial.
A one-time purchase of $150 is less than what I pay for Netflix in a year. It's not a meaningless amount, it's a fair price for a piece of software. Were it subscription, you'd pay paying $5 per month for years to come, with the software broken the moment you stop paying. I'll take my purchased software that will just keep working, thank you very much.
Take Jetbrains' software: I happily pay for that every year and it's 100% worth it. I could stop paying and use the fallback licence the rest of my lifr but I use the newer features and support often enough that I want to invest.
I've never used the tool in question but from what I can see it does a whole of a lot more than Meld or even Jetbrains' merge tool. It supports diffing a wild range of file formats that makes it useful for programmers but also helps out when cloud sync runs into conflicts.
Good tools often cost money. A carpenter doesn't buy value brand hardware for their most important tools and while a developer has the advantage of access to open source, paying for good tools shouldn't be controversial.
A one-time purchase of $150 is less than what I pay for Netflix in a year. It's not a meaningless amount, it's a fair price for a piece of software. Were it subscription, you'd pay paying $5 per month for years to come, with the software broken the moment you stop paying. I'll take my purchased software that will just keep working, thank you very much.
There are people reading this forum who earn mid 6-figure incomes in Silicon Valley. There are others that are first-year students at, say, Nigerian universities (median income $ 800). $ 150 can mean an hour of work or 1 1/2 months.
And the people who need to not eat for two months to pay for this software can do anything this software does with free software. You can image diff with Gimp, you can track versions through LibreOffice, you can three or four way merge using Meld or any other tool.
This is a shiny tool for developers from rich countries, not a necessity to develop code. I think your argument is valid for things like the price of an Apple dev account ($99 per year if you want to publish an app and no option for out-of-store distribution) but this is nothing more than a shiny UI that will save your minutes per day.
This is a shiny tool for developers from rich countries, not a necessity to develop code. I think your argument is valid for things like the price of an Apple dev account ($99 per year if you want to publish an app and no option for out-of-store distribution) but this is nothing more than a shiny UI that will save your minutes per day.
Not meaning to be rude, but how is this relevant? Should no one ever buy or discuss anything that someone else, somewhere else couldn't afford? That is just not realistic and I think you are ascribing a fragility to that student that is condescending. That student knows how the world works, including all of its distribution of wealth issues. Give them some credit, they can take care of themselves. As for the software, there are lots of free alternatives.
Sure. And the correct way to deal with that is to recognize that everybody is speaking from their own perspective, relative to their own circumstances and income, not to demand that every person's posts contain an encyclopaedic rundown of every possible perspective every other person on the planet may have on a price.
Because to expect the latter is both ridiculous and impossible.
Because to expect the latter is both ridiculous and impossible.
Meh. People have issue with those proselytizing crappy software that is not deserving of even a download.
The issue isn’t with people being derisive of bad alternatives, but folk who are so convinced of the utility of garbage that they keep promoting it.
Database / warehouse IDEs are also such an extreme edge case that I’ll leave to reader as an exercise to reason about. Why even bring that up?
The issue isn’t with people being derisive of bad alternatives, but folk who are so convinced of the utility of garbage that they keep promoting it.
Database / warehouse IDEs are also such an extreme edge case that I’ll leave to reader as an exercise to reason about. Why even bring that up?
150 would be peanuts if there weren't any other tools out there, but there are plenty of alternatives, both free and paid, and some of which people might already be paying for (IntelliJ/PyCharm has a very good built-in diff tool).
I get that. I'm sure I've paid for tools over the years that would make someone else shake their head. Good on the Kaleidoscope gang for making a tool that people are willing to shell out for.
It still gives me sticker shock, though.
It still gives me sticker shock, though.
I just realised I’ve been using Kaleidoscope for maybe 10 (?) years now.
I certainly didn’t pay $150 for it at the time, but if I had done, it would’ve been worth every penny.
—
I seem to recall the app was acquired by a new development team a couple of years ago. It seems to have been one of those rare acquisitions where it’s consistently gotten better afterwards (and it was great to begin with).
I certainly didn’t pay $150 for it at the time, but if I had done, it would’ve been worth every penny.
—
I seem to recall the app was acquired by a new development team a couple of years ago. It seems to have been one of those rare acquisitions where it’s consistently gotten better afterwards (and it was great to begin with).
Especially since you can’t even edit text directly in it. WinMerge is pretty much the only Windows app I miss now that I’m using MacOS full time.
That is false. You can edit directly in it, at minimum in 3 column view. I know because I do it regularly and have done for years.
It is not false. You can't just drop two text files onto Kaleidoscope and perform a diff with manual edits. I do know that Kaleidoscope can support editing under certain specific conditions, but those aren't relevant for me. WinMerge supports editing under any conditions.
https://twitter.com/kaleidoscopeapp/status/34193087090041651...
That tweet is from 2013 and nothing has changed in the intervening nine years.
https://twitter.com/kaleidoscopeapp/status/34193087090041651...
That tweet is from 2013 and nothing has changed in the intervening nine years.
Kdiff3
As a side note, sorry I even brought this up. While I still think it's expensive for what it is, darned if I'm going to chastise anyone for buying a tool they like. I certainly didn't expect the conversation to go off the rails like that.
Can't get work to drop $150 on it :(
Personally I prefer the IntelliJ merge tool since I don't have to pay extra for a 3rd program.
Possibly I was missing something, but I found Kaleidoscope's handling of directory comparisons was totally unworkable for anything but trivial sized projects.
Meaning, comparing two slightly different copies of a project containing maybe 1/4 a million files, with a few variations between them. It takes quite a while to initially open the comparison window, and that's fine as it's a lot of data to churn thru.
But where the problem lies, is when you dbl click into a subdirectory of that comparison, it again takes forever to open a window for just the contents of that directory, even thou it already has done a full comparison of all the files in it, when opening the parent comparison. For some reason it starts again in that sub directory instead of just using the comparison data it's previously generated.
I've used Araxis Merge, it's clunky, not really a true mac app, but actually works fairly decently. Pity it's effectively a subscription.
Meld is ok, but crashes with large comparisons, and the UI is fairly painful.
Meaning, comparing two slightly different copies of a project containing maybe 1/4 a million files, with a few variations between them. It takes quite a while to initially open the comparison window, and that's fine as it's a lot of data to churn thru.
But where the problem lies, is when you dbl click into a subdirectory of that comparison, it again takes forever to open a window for just the contents of that directory, even thou it already has done a full comparison of all the files in it, when opening the parent comparison. For some reason it starts again in that sub directory instead of just using the comparison data it's previously generated.
I've used Araxis Merge, it's clunky, not really a true mac app, but actually works fairly decently. Pity it's effectively a subscription.
Meld is ok, but crashes with large comparisons, and the UI is fairly painful.
This has been a great app when I can expense it to my employer.
But for personal use the UI improvements aren't quite enough to push me over the edge to buying it. The cheaper or open-source tools do just fine.
But for personal use the UI improvements aren't quite enough to push me over the edge to buying it. The cheaper or open-source tools do just fine.
I agree. The old version was super slow but still great, but the new major release a year or so ago is fantastic. Super fast, super intuitive. Well worth the $$
It truly astounds me that such expensive software gets sold to consumers.
Like "oh I could build that" kind of epiphanies.
Like "oh I could build that" kind of epiphanies.
Agreed, it really was great to see it get bought by people who are enthusiastic about rebuilding it.
It might seem expensive at first if you are not used to paying for software but it's not a subscription and if you use it at work you can probably get it through your employer in any case.
It might seem expensive at first if you are not used to paying for software but it's not a subscription and if you use it at work you can probably get it through your employer in any case.
Beyond Compare is a pretty good diff/merge tool that runs natively on macOS. Sure it's UI is slightly non-native too.
https://www.scootersoftware.com/
https://www.scootersoftware.com/
They have a great license too. I can bring my personal license to my work computers so it makes it a no-brainer to just buy the license and then use it everywhere. They recently made that one license work cross platform too, and retroactively upgraded my license for free.
I've done the same. Installed at home, on my work PC and laptop. So easy that I was happy to pay for it.
I love and highly recommend Beyond Compare. That being said, the Mac version could use a little love of late. They're a small team so I mean… priorities I guess…
It's decent. It's easy to use but it's getting a little old. And they still don't support line wrapping.
I love love Beyond Compare. It's been my go to diff tool for years.
I suppose this is because it's written in FreePascal using Qt.
AFAIK it is written in Lazarus/LCL which in addition to the Qt backend it also has a native Cocoa backend. I wonder if the Qt backend is still better than the native Cocoa backend though - it used to be the case some years ago as it was easier to interface with Carbon than Cocoa (Free Pascal got an entire new language mode - Objective Pascal - to be able to use Objective C objects directly to work with Cocoa) so for years most effort went on the Carbon backend until it was deprecated and removed for 64bit apps - but nowadays all work is on the Cocoa backend.
Perhaps in the future BC will switch to the Cocoa backend and provide more "native" controls (and wont need to bundle Qt either).
Perhaps in the future BC will switch to the Cocoa backend and provide more "native" controls (and wont need to bundle Qt either).
I love BC. The merge view was such a revelation. If you've never used it, do yourself a favor and try it out.
Big fan of beyond compare
One of the things I like in P4Merge is having 4 panes - the two versions, their common ancestor, and the final merge result. Can you get all these in Meld as well?
P4Merge is one of the few cross-platform apps that I use on the Mac because the functionality is so good.
I hate how the UI looks like a half-assed rip-off of Windows 95, but it's the only tool I know that shows me everything I want to see when merging / rebasing git branches.
I think it also allows comparing 3 or more arbitrary files, which seems like a pretty basic task that most diff tools just can't do at all.
I hate how the UI looks like a half-assed rip-off of Windows 95, but it's the only tool I know that shows me everything I want to see when merging / rebasing git branches.
I think it also allows comparing 3 or more arbitrary files, which seems like a pretty basic task that most diff tools just can't do at all.
I've always been puzzled by 4-way merge not being more common. Support is quite rare.
KDiff3 is another tool that supports it.
KDiff3 is another tool that supports it.
I’ve always been puzzled by 3-way merge being remotely common. It’s almost “Here’s your latest file on two branches, good luck!” — There is obviously one leg missing but dare pointing it to a developer and he will tell you “But we have everything there” and when you draw a graph to explain the conceptual problem, “Ok but in general the two ancestors are common.”
A fortnight later, they wreck a merge and they spend their afternoon re-merging conflicts they’ve already had.
Such people almost always use the git tools provided in IntelliJ.
A fortnight later, they wreck a merge and they spend their afternoon re-merging conflicts they’ve already had.
Such people almost always use the git tools provided in IntelliJ.
In my experience, ppl who are using command-line git or magit in Emacs are tying a knot on their genitals with trying to merge branches way more often than ppl using IntelliJ.
I wouldn't know how to explain what does the magic wand do, but it seems a huge waste of time NOT having it in other merge solutions. I can't remember a case where it the magic wand was causing a semantic error and I'm using it for 7-8 years by now. Mostly in Clojure code though.
I wouldn't know how to explain what does the magic wand do, but it seems a huge waste of time NOT having it in other merge solutions. I can't remember a case where it the magic wand was causing a semantic error and I'm using it for 7-8 years by now. Mostly in Clojure code though.
> but dare pointing it to a developer and he will tell you
Sadomasochism runs deep.
If you’re not suffering for your craft, you’re not a Real Programmer.
Sadomasochism runs deep.
If you’re not suffering for your craft, you’re not a Real Programmer.
> Such people almost always use the git tools provided in IntelliJ.
OTOH, IntelliJ’s "Magic wand" is totally worth the hassle.
OTOH, IntelliJ’s "Magic wand" is totally worth the hassle.
KDiff3 is so consistently good and itself. I’ve been using it for ever; i don't expect to stop.
Beyond Compare (not free) seems to have all kdiff3's features, plus some nice features for comparing tables (CSV or Excel) (although you need to tweak the defaults to make them actually useful). Also, it has syntax highlighting in its diff view, and I find its directory diff nicer than kdiff3's. I haven't used it for merging yet though; although it has three-way merge, I just am more familiar with kdiff3 and trust it since I've been using it for more than 20 years now.
[deleted]
P4merge is my favorite merge tool for this reason. It's also really good at solving whitespace conflicts for you.
I became familiar with it at a previous job that used perforce, and I have just kept using it with git. It's free to download, although you have to fill out an annoying form.
I became familiar with it at a previous job that used perforce, and I have just kept using it with git. It's free to download, although you have to fill out an annoying form.
This lack in Meld is exactly why I switched to kdiff3 for merges. It's just too hard with Meld.
But Meld is great at 2 way merges, and allowing you to selectively apply changes.
But Meld is great at 2 way merges, and allowing you to selectively apply changes.
I was moved by the message on the last GH release for Meld macOS. So tragic and sad, and I will pray for your brother Youssef.
Dedicated to Osama
If you use this software, please pray for my brother.
https://www.stuff.co.nz/national/christchurch-shooting/111375038/osama-abu-kwaik-was-a-refugee-born-to-an-orphan-who-died-in-christchurch-the-city-he-loved
I assumed this was a "more native" port of Meld to macOS, as it has been available for Mac for a while. I've been using the version installed via `brew`.
It appears this is the same version (the page says "Homebrew now installs Meld for OSX").
The macOS integration is a bit klunky (really feels like a non-native app), but this remains my preferred visual diff app. Thanks to those who make it and maintain the macOS port.
It appears this is the same version (the page says "Homebrew now installs Meld for OSX").
The macOS integration is a bit klunky (really feels like a non-native app), but this remains my preferred visual diff app. Thanks to those who make it and maintain the macOS port.
I used to use this until I discovered vim has a built in diffing mode - vimdiff. I’d still be using Meld if vim wasn’t already so much part of my workflow.
I get confused by diff GUIs but I have been using "git-delta" https://github.com/dandavison/delta as a pager of git and it's been wonderful so far (just for the syntax highlighting in diff)
diffstatic is nice too and use it sparingly
diffstatic is nice too and use it sparingly
Shout out to Emacs Ediff - it can compare files, directories, buffers (open files), regions within buffers (selected text within files, and is version control aware.
Once I learned to use Ediff with Magit there was no going back. It has been consistently the quickest and easiest thing for solving complicated merges of many files in a rebase.
Any experience with vdiff?
https://github.com/justbur/emacs-vdiff
How does it fare compared to ediff?
Never used it. I suppose if you are fond of vimdiff, but migrating to emacs it might be nice.
Sublime Merge (when it comes to git integration) is the best choice now - at least for me.
Meld, on the other hand, is the best tool for comparing local copies and directories.
Meld, on the other hand, is the best tool for comparing local copies and directories.
I REALLY love the way merge tool works in IntelliJ IDEA.
Is there some other tool out there that works in a similar way, and that good?
(tho, typing idea . and doing a merge fix is not that bad)
Is there some other tool out there that works in a similar way, and that good?
(tho, typing idea . and doing a merge fix is not that bad)
You actually CAN use idea as a standalone merge tool[1], I have these lines in my .gitconfig for years now:
[1]: https://www.jetbrains.com/help/idea/command-line-merge-tool....
[mergetool "idea"]
cmd = /usr/bin/env idea merge "$LOCAL" "$REMOTE" "$BASE" "$MERGED"
[1]: https://www.jetbrains.com/help/idea/command-line-merge-tool....
I wish IntelliJ would sell git-only tool - their three way merge tool is the best I’ve used, and would gladly pay for a license.
Actually, I think I answered my own question.
That tool is so good because it leverages the entire eco-system of IDE it is running in. The resulting merge panel is as powerful as any editor window in the IDE. It has code inspections, it detects missing imports, it does everything.
It might be the case that ripping the diff/merge tool out of the IDE would result in way inferior product than we get when we use it within the IDE.
That tool is so good because it leverages the entire eco-system of IDE it is running in. The resulting merge panel is as powerful as any editor window in the IDE. It has code inspections, it detects missing imports, it does everything.
It might be the case that ripping the diff/merge tool out of the IDE would result in way inferior product than we get when we use it within the IDE.
The only issue I have with it is that it doesn't provide breadcrumbs when diffing. If you've set it to collapse unchanged fragments, it can be hard to tell when a line is in another function, conditional block, etc.
Otherwise, yeah it's amazing!
Otherwise, yeah it's amazing!
It's great. When I'm in a file in PyCharm or IntelliJ, I use ⌥⌘x (custom keymapping for select branch to compare) to select a branch to compare to and the diff is great.
Agreed. The magic button the top have saved me dev years of time.
Which magic button?
Strange that no one mentioned Araxis merge
https://www.araxis.com/merge/index.en
https://www.araxis.com/merge/index.en
The problem with Araxis Merge is you have to pay for upgrades. Sure you don't "have to", but eventually it stops working for some reason and/or you get new machine, cant find the license key, and it's awkward so you end up having to buy a new one.
I've used it for more than 15 years, and bought it 3-4 times. I honestly don't believe it's worth that, and I'm not going to buy it again. I would be willing to pay what they ask for a years license, to actually own it in perpetuity, only receiving updates when OS changes stop it functioning. As they won't offer that, I no longer use it.
I've used it for more than 15 years, and bought it 3-4 times. I honestly don't believe it's worth that, and I'm not going to buy it again. I would be willing to pay what they ask for a years license, to actually own it in perpetuity, only receiving updates when OS changes stop it functioning. As they won't offer that, I no longer use it.
I use it on macOS. It's quite good!
Life saver.
Just plugging difflens here: https://github.com/marketplace/difflens
If you work primarily with frontend technologies and want a syntax aware diff on GitHub PRs, difflens might be right up your alley! Standalone Mac and Windows apps are coming out soon.
If you work primarily with frontend technologies and want a syntax aware diff on GitHub PRs, difflens might be right up your alley! Standalone Mac and Windows apps are coming out soon.
Honest question: I have been using emacs/vim for many years, and always just used the diff viewer shipped with them. Any reason to switch to these tools? Do they have some functionality not available in these old tools? I am, frankly, ignorant of what these tools provide.
I really like vimdiff, but I belive it doesn't do folder diffs (whereas beyond compare does this well)
Maybe my use-cases are too basic? I appreciate a good diff gui, but really like vimdiff more than almost all of the ones I've seen. For folders `diff -qr one/ two/` does everything I feel like I need. I love just filtering things with grep instead of trying to figure out however that tool wants to ignore specific changes.
Strange, I haven't used a merge tool in 2-3 years.
old job: Changes staged locally for 2-3 weeks sometimes. Team-specific branches, integrating into the mainline periodically.. eventually moved to several hundred devs committing to mainline. One monster repo
Beyond Compare 2 was the only tool for the job simply for the ability to provide a manual hint (via spacebar) to align two version of the same file
current company: never merge more than a line or two which I do with vim. Change sets only last max 1 week on my machine. We have 5-6 services (each in their own repo). 20 people committing amongst them all.
I do wish our code review tool was better though. Perhaps I will take one of the suggestions from this thread and build a custom CR work flow.
old job: Changes staged locally for 2-3 weeks sometimes. Team-specific branches, integrating into the mainline periodically.. eventually moved to several hundred devs committing to mainline. One monster repo
Beyond Compare 2 was the only tool for the job simply for the ability to provide a manual hint (via spacebar) to align two version of the same file
current company: never merge more than a line or two which I do with vim. Change sets only last max 1 week on my machine. We have 5-6 services (each in their own repo). 20 people committing amongst them all.
I do wish our code review tool was better though. Perhaps I will take one of the suggestions from this thread and build a custom CR work flow.
I found it a bit frustrating that merge tools I used were never able to solve trivial merge conflicts automatically. So I built something myself: https://fdietze.github.io/blend
On that page you can paste your merge conflict and copy the automatically merged result, along with some useful diffs. I hope it helps someone else. So far it solves around 80% of my conflicts automatically.
On that page you can paste your merge conflict and copy the automatically merged result, along with some useful diffs. I hope it helps someone else. So far it solves around 80% of my conflicts automatically.
This is what I use in my ~/.gitconfig:
[difftool "meld"]
cmd = meld "$LOCAL" "$REMOTE"
[mergetool "meld"]
cmd = meld --auto-merge --output "$MERGED" "$LOCAL" "$BASE" "$REMOTE"As far as I understand, this only resolves conflicts, git can already resolve with it's line-based approach. I'm talking about conflicts within a single line, that a line based approach cannot solve.
Thanks! I wasn't understanding that before.
Fun Fact. FileMerge.app has remained essentially unchanged since it was introduced in NeXTSTEP (I think 3.2 or earlier) in the early 1990s.
FileMerge is a complete app. There's nothing more that it needs to do. It's trivial to understand, there is no learning curve, and it is my go-to tool when I need to quickly diff two files or folders.
> FileMerge is a complete app.
As are many other apps. Yet they keep getting redesigned and engulfed by endless feature creep because people gotta work on something.
As are many other apps. Yet they keep getting redesigned and engulfed by endless feature creep because people gotta work on something.
It’s what I use for my diff tool with git. It’s available on the command line as opendiff.
yup. protip:
Put this in your ~/.gitconfig
Put this in your ~/.gitconfig
[merge]
tool = opendiff
`git mergetool`
Can you edit the merge result in-place though?
I can't live without that feature. After you experience the convenience of that, jumping elsewhere to adjust the merged code feels such a hassle...
No, not really. It may look similar but a lot of it has changed between the early 1990s and today.
Copyright on it is 1996
FileMerge was released in NeXTSTEP 3.2, which came out in 1993. See for example: https://www.blackholeinc.com/Library/94%20Jan.html
Indeed, I have it on my Turbo NeXTStation (3.2). Was it revised slightly for NeXTSTEP 4.0 (1996) perhaps?
Indeed, I have it on my Turbo NeXTStation (3.2). Was it revised slightly for NeXTSTEP 4.0 (1996) perhaps?
[deleted]
Meld is great. It has my favorite clean UI of any 3-way diff/merge tool, but the horrendous performance on Mac because of GTK3 makes it hard to use sometimes.
It has fairly bad performance in UI-terms in my experience on Linux as well with large files, I think because it's written in Python, so things like highlighting take ages...
How does it compare to WinMerge? I haven't found a tool on any platform that beats it.
In fact, I use Wine on my Mac specifically so I can use WinMerge.
In fact, I use Wine on my Mac specifically so I can use WinMerge.
I’ve used both and I found Meld fits my needs in Linux in the same way that WinMerge did in windows.
Which would you use if you could run WinMerge seamlessly in Linux or Meld seamlessly in Windows?
Meld does support windows. Meld doesn’t feel “native” in windows, or it didn’t 5+ years ago when I used it. It’s been so long since I’ve used windows daily that I can’t even remember any significant difference between the two to be honest.
I still use WinMerge under desktop Linux. Has quite some features and importantly it's fast (unlike anything Python...).
I find Meld's UI more pleasant.
kdiff3 easily beats it, if only for its 3-way merge, manual line alignment option and general robustness.
> kdiff3 easily beats it
Gonna have to agree to (vehemently) disagree on that. :)
Gonna have to agree to (vehemently) disagree on that. :)
Has WinMerge quadrupled its number of features in the last decade then? kdiff3 was such a relief, also for reliability and speed.
> Has WinMerge quadrupled its number of features in the last decade then?
It has not.
I have both installed. WinMerge is the superior program. It has 3-way merge, among many, many other features.
Are you thinking of WinDiff? https://adamtheautomator.com/windiff/
I'm talking about WinMerge: https://winmerge.org/?lang=en
It has not.
I have both installed. WinMerge is the superior program. It has 3-way merge, among many, many other features.
Are you thinking of WinDiff? https://adamtheautomator.com/windiff/
I'm talking about WinMerge: https://winmerge.org/?lang=en
Meld is one of the first things I make sure I have on a new Linux install. Usually good apps come out for Mac only and the likes of me go all "wot, no Linux version?" but today I learned that until today, Mac users might have said that on Meld.
> but today I learned that until today, Mac users might have said that on Meld.
The same thing for KDE connect two days ago. I am not sure I totally agree with the feeling though, in fact, it's the opposite. Many apps I use on a daily basis are not available for Mac.
The same thing for KDE connect two days ago. I am not sure I totally agree with the feeling though, in fact, it's the opposite. Many apps I use on a daily basis are not available for Mac.
I very recently learned that KDE Connect has a Gnome version.
My comment was mostly said jokingly. I have been using Linux exclusively for the past 18 years or so. My only experience is seeing posts about Mac apps I think are cool, only to find later they only exist in the OSX world.
If you are going through all the trouble to make a nice macOS build, why wouldn't you notarize it?
I know that it's mostly security theather, but those scary warnings that Apple shows for software they haven't notarized must scare a lot of people away.
I know that it's mostly security theather, but those scary warnings that Apple shows for software they haven't notarized must scare a lot of people away.
You need to sign the Apple Developer terms of service and pay $100 annually I believe.
People who ascribe to the FLOSS ethos are often opposed to the terms and conditions Apple dictates.
People who ascribe to the FLOSS ethos are often opposed to the terms and conditions Apple dictates.
Would love to know how it compares to Beyond Compare, which is the tool I've been using for the last decade on the Mac
Beyond Compare is significantly better.
I use neovim as mergetool and some ad hoc diff tasks, but I'm glad to see meld on Mac. It is the tool I recommend when I see someone struggling with git rebase conflicts (and not using using vim).
Thank you for Meld for OSX, love it.
Always used meld on Ubuntu as well. I love how simple and clear it is.
Small UX/QOL improvement on OSX could be to remember the window's position and size between launches.
Always used meld on Ubuntu as well. I love how simple and clear it is.
Small UX/QOL improvement on OSX could be to remember the window's position and size between launches.
> If you want to donate, please donate to the original Meld project.
Anyone know how to actually do that? I've not been able to find a donation link on the Meld website.
Anyone know how to actually do that? I've not been able to find a donation link on the Meld website.
https://discourse.gnome.org/t/support-donate-to-meld/6909:
“We usually don’t receive donations for specific GNOME projects, but we collect donations for the whole organization. You can donate to GNOME at Donate – GNOME 6
Thanks for your interest in helping!“
(donation link is https://www.gnome.org/donate/)
“We usually don’t receive donations for specific GNOME projects, but we collect donations for the whole organization. You can donate to GNOME at Donate – GNOME 6
Thanks for your interest in helping!“
(donation link is https://www.gnome.org/donate/)
Kaleidoscope is def (pun intended) the prettiest diff'ing tool, but it is very sluggish on 1000+ line files. In those cases I use CompareMerge.
Oh, this is the greatest! The brew version of meld is quite out of date (still very functional). Don't know how I'd live without it...
Makes me concerned when they still use the phrase "Mac/OSX" instead of the correct nomenclature "macOS".
yes, it's in homebrew
Meld is excellent, cool to see a port for Mac too!
there is also diffuse merge tool, it's pretty good, it works on mac as well (I personally use it on fedora through flatpak)
i like meld. but i dont like how it takes ages to start on windows
Feel so bad for Mac people, things we take for granted in GNU world need to undergo so much ceremony and packaging to get into the ecosystem there.
[deleted]
It has a new release and is the most Mac-like of the various diff tools I've used.