3 ms·

From the title I was hoping that it was going to do syntax-aware alignment of diffs, but alas no. I've been using kdiff3 even though it hasn't been updated in

by joncp 6y ago

From the title I was hoping that it was going to do syntax-aware alignment of diffs, but alas no. I've been using kdiff3 even though it hasn't been updated in a very long time because it has one killer feature: manual diff alignment. I can select a token in both (or all three) files and then force the diff to align at that point. It makes merges a whole lot easier. Sometimes, a single realign is all that's needed for a file merge to sort itself out. Even when that's not the case, it's easier to reason about the changes. Did I miss something? That is, is that feature available in other diff/merge tools and I just haven't seen it?

Iwan-Zotow 6y ago
> Did I miss something? Sure https://download.kde.org/stable/kdiff3/ https://download.kde.org/stable/kdiff3/
- joncp 6y ago
  Aww, you got my hopes up but that looks like KDE-only fork of the original, which lives here: http://kdiff3.sourceforge.net/ http://kdiff3.sourceforge.net/
  - vlovich123 6y ago
    https://github.com/KDE/kdiff3 https://github.com/KDE/kdiff3 In theory there's newer builds of kdiff3 but I've not had any luck running the Windows versions & I don't think there's been significant improvements to the manual alignment code which still require a lot of battling to get the right outcome.
- nyanpasu64 6y ago
  Kinda disappointed that the old Qt4 KDiff3 setup for Windows is 11 MB, but the KDE Qt5 KDiff3 setup is 51 MB.
IshKebab 6y ago
Yeah me too. I actually had to go back and read the text to figure out what improvement had been made because it looked identical. I was expecting something like MergeResolver which diffs Javascript ASTs: https://mergeresolver.github.io/ https://mergeresolver.github.io/
mmebane 6y ago
Beyond Compare [0] has manual alignment. It works within files as well as within directories, allowing you to match up files with different names when comparing directories. I don't think it has syntax-aware alignment, though. [0]: https://www.scootersoftware.com/ https://www.scootersoftware.com/
usr1106 6y ago
meld has manual alignment
secondcoming 6y ago
P4merge is my go-to tool for diffs and merges.

by joncp 6y ago

Iwan-Zotow 6y ago

> Did I miss something? Sure https://download.kde.org/stable/kdiff3/ https://download.kde.org/stable/kdiff3/

joncp 6y ago
Aww, you got my hopes up but that looks like KDE-only fork of the original, which lives here: http://kdiff3.sourceforge.net/ http://kdiff3.sourceforge.net/
- vlovich123 6y ago
  https://github.com/KDE/kdiff3 https://github.com/KDE/kdiff3 In theory there's newer builds of kdiff3 but I've not had any luck running the Windows versions & I don't think there's been significant improvements to the manual alignment code which still require a lot of battling to get the right outcome.
nyanpasu64 6y ago
Kinda disappointed that the old Qt4 KDiff3 setup for Windows is 11 MB, but the KDE Qt5 KDiff3 setup is 51 MB.

IshKebab 6y ago

Yeah me too. I actually had to go back and read the text to figure out what improvement had been made because it looked identical. I was expecting something like MergeResolver which diffs Javascript ASTs: https://mergeresolver.github.io/ https://mergeresolver.github.io/

mmebane 6y ago

Beyond Compare [0] has manual alignment. It works within files as well as within directories, allowing you to match up files with different names when comparing directories. I don't think it has syntax-aware alignment, though. [0]: https://www.scootersoftware.com/ https://www.scootersoftware.com/

usr1106 6y ago

meld has manual alignment

secondcoming 6y ago

P4merge is my go-to tool for diffs and merges.