[dead]
Meld is a visual diff and merge tool targeted at developers
141–146 of 146 posts
Re: Meld is a visual diff and merge tool targeted at developers
#142It's not open source, and comes with all the baggage of perforce, but p4merge and p4diff are just excellent tools that I install on every machine I work on.
As another former p4 user, know of any git tool that provides anything like p4's blame viewer (was it called "time-lapse view"?)?
Afraid not, it's one of the things I miss most about p4.
Re: Meld is a visual diff and merge tool targeted at developers
#143Re: Meld is a visual diff and merge tool targeted at developers
#144Earlier quoted context omitted.
Wikipedia, Google Docs, Microsoft Word... they're far simpler systems, but still useful for everyday edits
These have some diff functionality but are not "diff / merge tools". There are diff tools, though, targeted at lawyers for legal work: "show me the differences between these two contracts" and the such (which most developer-oriented tools actually suck at as they care too much about "lines" and whitespace).
> There are diff tools, though, targeted at lawyers for legal work: "show me the differences between these two contracts" ...
Do you have some examples from the top of your head?
Comparing the content of PDF files would be awesome, and I don't mean comparing graphically but textually.
Re: Meld is a visual diff and merge tool targeted at developers
#145My .gitconfig for using meld at the git merge tool: [alias] mt = mergetool [merge] tool = mymeld conflictstyle = diff3 [mergetool "mymeld"] # Gives you meld, with three comparison tabs. Assuming you're merging others changes into # your branch, this shows you: # - 1st tab: yours|merged result|theirs (do the merge here into the middle pane) # - 2nd tab: base vs your changes (look at just your changes) # - 3rd tab: bas…
So this works by 'git merge feature/branch' and then call 'git mt'?
Yes. If you have a conflict, you can either run `git mergetool` and it will use that meld config. `git mt` is an alias for `git mergetool`.
Re: Meld is a visual diff and merge tool targeted at developers
#146As a long time Sublime Text[1] user, I've been using Sublime Merge[2] since the day it's been launched and it brings me the same speed and minimalism I get with Sublime Text and has evolved quite a lot to be able to do most things I need in a merge tool. Not affiliated with them in any way by the way. [1] https://www.sublimetext.com/ [2] https://www.sublimemerge.com/
a nice feature of sublime merge that i haven't seen in other programs is actually showing you the git commands that will run when you press whatever button
Sourcetree also shows the git commands it runs, but not before it runs them.