Menu
I have Tortoise SVN but I don't like the diff tool. Is there a way to use Meld with tortoise SVN? I know tortoise has an option to set external diff tools, but I am not sure how to use that with meld.
786
Just hold down the Shift key while you right click on the file. Then select TortoiseSVN → Diff with URL. In the following dialog, specify the URL in the repository with which you want to compare your local file to.
Meld Diff lets you use meld to compare files or folders from visual studio code directly. This extension open two files (or folders) in the external tool meld . To install, launch VS Code Quick Open using (Ctrl+P), paste ext install danielroedl. meld-diff , and press enter.
Download meld from http://sourceforge.net/projects/meld-installer/
Unpack the downloaded zip archive into "Program Files" or wherever you want it to be installed. This will create two folders, named "meld" and "python".
Start "meld.exe" from the "meld" folder. If you get a Meld window opened, then you have installed Meld successfully.
In TortoiseSVN, select Settings, then go to External Programs -> Diff Viewer on the left panel. In Configure the program used for comparing different revisions of files, browse to the Meld executable, "meld.exe", in your "meld" folder. Click on Apply.
That's it!
153
With Meld 3.12 on windows this didn't work for me when merging.
My 'Merge Tool' command is:
C:\Program Files (x86)\Meld\meld\meld.exe --auto-merge --output %merged %mine %base %theirs
39
This worked for me (Meld 1.8.6):
meld %mine %merged %theirs --output %merged --auto-merge
Super fancy: three-way merge with extra tabs for [mine vs base] and [theirs vs base].
meld %mine %base %theirs -o %merged --diff %base %mine --diff %base %theirs --auto-merge
https://lukas.zapletalovi.com/2012/09/three-way-git-merging-with-meld.html
28
If you love us? You can donate to us via Paypal or buy me a coffee so we can maintain and grow! Thank you!
Donate Us With
