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
127
votes
3 answers

How to ignore SVN folders in WinMerge?

I'm trying to recursively compare two Subversion working copy folders using WinMerge. Unfortunately, WinMerge displays lots of differencing files inside of the subversion control folders (.svn or _svn). Is it possible to somehow exclude the…
M4N
  • 94,805
  • 45
  • 217
  • 260
114
votes
9 answers

use Winmerge inside of Git to file diff

Is there a way to use Winmerge inside of git to do Diffs?
eiu165
  • 6,101
  • 10
  • 41
  • 59
70
votes
3 answers

How to integrate WinMerge with TortoiseSvn after installation?

When you install winmerge after TortoiseSVN it gives you the option of associating winmerge with Tortoise. But if we install TortoiseSVN after winmerge how can we associate Winmerge to be used instead of Tortoise default diff viewer.
Rakesh Juyal
  • 35,919
  • 68
  • 173
  • 214
68
votes
16 answers

How can I make WinMerge my git mergetool?

I'm trying to integrate WinMerge with Git as I've seen others done before on Windows 7 Ultimate. I've followed the following steps, but an error continues to show up when I do a git mergetool which defaults to vimdiff. Created a file called…
Wei Jin
  • 701
  • 1
  • 6
  • 3
59
votes
5 answers

How to use Winmerge with Git Extensions?

I'm using Git Extensions and it pre-installs and sets up KDiff as the diff tool to solve merge conflicts. I'm very fond of Winmerge though and would like to replace KDiff with Winmerge. In the Git Extensions settings, there are settings to change…
sebastiaan
  • 5,870
  • 5
  • 38
  • 68
44
votes
1 answer

Line number in WinMerge

I start to use WinMerge. I would like to see line numbers to easily navigate in files. I cannot find the option. Does someone know where I can turn it on, or is it possible?
Jacek
  • 11,661
  • 23
  • 69
  • 123
35
votes
3 answers

System versus user PATH environmental variable...winmerge works only if I add the path to the user PATH

If I add C:\Program Files (x86)\WinMerge to the User PATH variable(by right click on computer -> advanced system settings -> environmental variables), once I open a new cmd shell WinmergeU.exe is not recognized. If I add that path to the System PATH…
Millemila
  • 1,612
  • 4
  • 24
  • 45
32
votes
2 answers

Use WinMerge as TortoiseHG Merge tool

I am trying to set up WinMerge as the Merge tool into TortoiseHG; Here is my Mercurial.ini: ; User specific Mercurial config file. ; See the hgrc man page for details. [ui] username = Bargio <> merge = winmergeu [extdiff] cmd.winmerge =…
Gianluca Bargelli
  • 1,780
  • 2
  • 17
  • 23
26
votes
3 answers

How do I configure TFS to work with various merge tools

Originally the question was "How do I configure WinMerge as the compare and merge tool for TFS". However, I am changing it because TehOne answered this more general form of the question. I would have though this would have been asked already on…
Justin Dearing
  • 14,270
  • 22
  • 88
  • 161
19
votes
10 answers

How can I get WinMerge to keep left and right?

Using the TFS merge tool, I can click on the left side and the right side to keep both changes/conflicts. This is needed when I add a method and another team member adds a method in the same place and I need to keep them both. In WinMerge (file…
NotDan
  • 31,709
  • 36
  • 116
  • 156
18
votes
2 answers

Winmerge - Way to make identical lines not to be shown when compare 2 files?

When I compare 2 large files I used winmerge It is a great tool that can find the delta between 2 files In my case Each of 2 files nearly contains 3000 lines And there are some lines ONLY contain changes Any Way to make identical lines in both…
Ahmed Nabil
  • 17,392
  • 11
  • 61
  • 88
18
votes
6 answers

Copy only difference (kdiff, winmerge, any diff like tool)

Is there possibility of copy ONLY difference of two files? Like in winmerge, but, I can't find this option Just like on this screen- i want to copy only 'yellow part' . Of course I can do that manually, but in big file it's not too funny :-)
Nicramus
  • 606
  • 1
  • 6
  • 19
17
votes
6 answers

WinMerge: How to compare files with the same content but different encodings?

Motivation: I am rewriting a doc -- text files to be processed later. The new sources now use UTF-8. Large portions of the sources are the same. I need to find differences. Details: The old doc sources use the cp1250 encoding, the new sources use…
pepr
  • 20,112
  • 15
  • 76
  • 139
11
votes
2 answers

WinMerge - ignore all whitespace including newlines and formatting changes

How can I ignore "code style" changes while using WinMerge as a difftool? Specifically across two commits. So that thing { a, b } and thing { a, b } would be treated as identical. Essentially this question, but for winmerge rather than…
MHebes
  • 2,290
  • 1
  • 16
  • 29
11
votes
1 answer

How do I tell Visual Studio to use WinMerge with Git?

I'm using Git with VS2017 Enterprise, and if I right-click a file in Changes and choose "Compare with unmodified" it opens in a new window in VS using the VS diff tool. I would like to use WinMerge instead, and have been looking at resources such as…
Avrohom Yisroel
  • 8,555
  • 8
  • 50
  • 106
1
2 3
…
9 10