Stack Overflow
Stack Overflow

Questions tagged [winmerge]

WinMerge is a Windows-based software tool for file/folder comparisons, and for merging text files.

WinMerge is an Open Source differencing and merging tool for Windows. WinMerge can compare both folders and files, presenting differences in a visual text format.

138 questions
3
votes
1 answer

What are the parameters for using WinMerge in Subclipse?

For using WinMerge in Subclipse, What are the parameters in Preferences > Team > SVN > Diff/Merge? Is this correct? /dl "Base" /dr "Mine" "${base}" "${mine}"
geffchang
  • 3,279
  • 2
  • 32
  • 58
3
votes
2 answers

How can you remove the option to use WinMerge when diffing with tortoise svn

I just installed WinMerge on my windows machine. When doing setup it asked if I would like to use WinMerge in conjunction with tortoise svn. The link here sort of describes that functionality. http://manual.winmerge.org/VersionControl.html I really…
Colton Phillips
  • 363
  • 1
  • 8
  • 13
3
votes
1 answer

How to apply a prediffer to WinMerge such that it runs on all files in the diff?

TL;DR: How can I automatically apply PrediffLineFilter on all diff results, not manually on only the open file? WinMerge 2.16.4.0 supports using plugin prediffers to, among things, diff while ignoring items that meet conditions specified with a…
Neman
  • 157
  • 1
  • 11
3
votes
1 answer

Mercurial/extdiff not changing to temp dir (as I THINK it's supposed to)

Using Windows, Mercurial, and the extdiff extension (for Mercurial). I was trying to set up extdiff to use WinDiff as an external diff tool, but I think I've narrowed the problem down enough to say that the trouble is before I'm even getting that…
loneboat
  • 2,845
  • 5
  • 28
  • 40
3
votes
1 answer

How to use WinMerge instead of TortoiseMerge when comparing a revision with the working copy

I like using WinMerge instead of TortoiseMerge with TortoiseSVN for comparing changes between separate revisions of a file. I can configure this for most things in the TortoiseSVN settings (context menu > "TortoiseSVN" > "Settings" > "Diff…
rory.ap
  • 34,009
  • 10
  • 83
  • 174
3
votes
3 answers

TortoiseSVN identifies modified file - so why does svn diff report no differences?

I have a folder checked out using TortoiseSVN. If I copy a newer version of a file over the existing versioned file, TortoiseSVN correctly identifies that the file is modified. However when I do a "diff with previous version", it reports "no…
Matthew Hegarty
  • 3,791
  • 2
  • 27
  • 42
3
votes
2 answers

What is the rule of MSYS/MinGW path translation?

I have been following this post on how to use Winmerge as a diff tool in git. Initially it doesn't work (ok now, therefore irrelevant to my question here). One key difference is I'm using git provided inside MSYS2, not the msysgit under native…
Abel Cheung
  • 417
  • 5
  • 12
3
votes
0 answers

Compare two remote files from windows

I have two environment as preprod.xxx.com and test.xxx.com. After I tested everything on test environment, I merge the codes to pre-prod via TFS. After I solve conflicts and everything else I have to compare test.xxx.com/web.js to…
engincancan
  • 2,442
  • 2
  • 28
  • 43
3
votes
2 answers

How to tell WinMerge to ignore binary files in folder compare?

Is it possible to make WinMerge ignore binary files and do only text files comparison when comparing folders?
ysap
  • 7,723
  • 7
  • 59
  • 122
3
votes
1 answer

WinMerge configuration when called from TortoiseHG/Mercurial

Summary: When TortoiseHG/Mercurial calls WinMerge, it appears to pass as standard the /e command line parameter. How do I configure it so that command line parameter is not passed? Details: I'm using TortoiseHG(2.10.1) and WinMerge (2.14.0) on…
freefaller
  • 19,368
  • 7
  • 57
  • 87
3
votes
2 answers

How to "programmatically" integrate diff tool with Visual Studio

Is there a way to "programatically" integrate a diff tool (like WinDiff and WinMerge) with Visual Studio 2010? These files are not the files found at Solution Explorer. The program would have to search and store in the List the files found from…
NullReferenceException
  • 279
  • 1
  • 13
  • 22
3
votes
3 answers

Getting WinMerge to compare .jar files

I have two directories which contain a handful of *.jar and *.war archives, as well as some metadata files and a file with *.spring extension, which is really just a zip file with an odd name. Something like this: - dist1 - a subfolder -…
Tomas Aschan
  • 58,548
  • 56
  • 243
  • 402
3
votes
4 answers

Is it possible to configure AccuRev to use WinMerge as its diff/merge tool?

I see in AccuRev's Diff/Merge Preferences tab that the diff and merge tools can be switched to a pre-defined list of third-party tools. These are the choices I have: Diff AccuRev TkDiff Araxis BeyondCompare V1 BeyondCompare…
Christopher Parker
  • 4,541
  • 2
  • 28
  • 33
2
votes
1 answer

android winmerge filter rules

I want to use winmerge to merge two directories containing android projects. I wnat to merge only source files (.java ) , resource files ( layout / values/ drawable ) Can anyone help me with the rules for fileter. This is the first time iam using…
png
  • 4,368
  • 7
  • 69
  • 118
2
votes
1 answer

WINMERGE Shows Chinese Characters but its just XML

I want to merge two XML documents with WinMerge but the file content is displayed as Chinese characters. Here my XML (Edited with VS Code): File 1: …
Felix Arnold
  • 839
  • 7
  • 35
1 2 3
…
9 10