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
6
votes
1 answer

How to get winmerge to show diff for new file in git?

I can get winmerge to show me diffs for modified file. But for new files, winmerge gives a dialog saying 'Left path is invalid!'. I want it to show the left pane as empty and right pane with the contents of the file. $ git difftool head^…
hIpPy
  • 4,649
  • 6
  • 51
  • 65
6
votes
3 answers

How to ignore a line containing a specific word using winmerge line filters?

I have many files containing following types of line - * @version $Revision: 1.xxx I want this type of line to be ignored while comparing using winmerge. I have tried with line filters. But, till not able to do that. Can any one…
sayantan rana
  • 131
  • 1
  • 1
  • 6
6
votes
2 answers

Can I use WinMerge as my merge/diff tool within Visual Studio?

I need to compare two files in my project, which is written in C#. Can I integrate WinMerge (or any other diff tool) with Visual Studio and use it easily from within?
Neeraj Dubey
  • 4,401
  • 8
  • 30
  • 49
6
votes
2 answers

WinMerge - Is there a way to line up shifted/moved code blocks?

When using WinMerge I am looking at a file that has had a block of code inserted into a function which causes the rest of the file to be out of sync in the comparison. Mine is much more complex but essentially the same as the simple example below: …
jterm
  • 973
  • 1
  • 12
  • 32
5
votes
1 answer

Git Diff Tool setting in Visual Studio 2019 16.10.3 not working

Since updating VS2019 to version 16.10.3, I can't get "Compare with Unmodified..." to use WinMerge as my Diff Tool. In my global '.gitconfig' I've got: [diff] tool = winmerge [difftool "Winmerge"] cmd = "'C:\\Program…
JNygrenLT
  • 173
  • 12
5
votes
1 answer

Setting up WinMerge as Diff tool for Visual Studio 2019 for Git

First what I found is that for to change diff tool used in Team Explorer in VS I don't have settings in VS, I need to edit .gitconfig? [EDIT] Is it possible that using portable version of WinMerge caused some problem? So step 1: git config --global…
watbywbarif
  • 6,487
  • 8
  • 50
  • 64
5
votes
4 answers

Get line numbers of differences in two files when performing a diff on two files in Windows

For the purposes of code review, after an existing source file is modified, we only review lines of code that have been changed in those source files. After I make changes to source files in a repository, I must communicate the lines of code that…
Zoot
  • 2,217
  • 4
  • 29
  • 47
5
votes
1 answer

Is it possible to use winmerge to view git diffs from cygwin?

I like to use git on cygwin, but the only downside I have is when I want to git difftool I cannot use anything useful. git diff is fine for me most of the time, but sometimes I'd like to use winmerge to view these diffs via git difftool is there…
erikvold
  • 15,988
  • 11
  • 54
  • 98
5
votes
2 answers

How to diff custom file list with WinMerge

I have a code directory structure, which is this: modudle1 trunk pom.xml branches 1.1 pom.xml modudle2 trunk pom.xml submodule-2.1 pom.xml submodule-2.2 pom.xml branches …
NSPKUWCExi2pr8wVoGNk
  • 2,449
  • 2
  • 22
  • 26
5
votes
1 answer

How to write a WinMerge plugin in C# (or VB.NET)

I would like to write a WinMerge plugin to translate SQLite databases to text, so I can use WinMerge to compare databases. I have written code in C# to do the conversion, but I can't seem to make it appear as a WinMerge plugin. But I'm not very…
Nikki Locke
  • 2,759
  • 6
  • 29
  • 53
5
votes
2 answers

Winmerge : how to ignore differences in lines with a special ending tag

I would like to ignore difference in lines, if one of the files has a line ending with //ignore is this possible? how would the regular expression for the line filter be written? tried .*//ignore$ but this does not work
rekna
  • 5,313
  • 7
  • 45
  • 54
4
votes
2 answers

Mapping line numbers across two diff files using emacs/python/winmerge

Consider the following two files that are slightly different: foo (old version): a b c d foo (new version): a e b c f d As you can see, characters e and f…
Pulimon
  • 1,776
  • 4
  • 31
  • 45
4
votes
6 answers

What is a merge friendly format for entering text tokens

I have an excel list (excel 2003) where user enter translations for tokens. It has 3 columns (key, value, language). It can be something like key: Login.Header, value: "Please login to the website" language: en. This works quite well. I use this…
Mathias F
  • 15,906
  • 22
  • 89
  • 159
4
votes
0 answers

Mercurial 3-way Diff Without Merging

I've got WinMerge set up to compare two arbitrary revisions like so: hg windiff -r 23 -r 37 I've got kdiff3 set up to be used for 3-way comparisons during merge resolution. How does one configure mercurial to use kdiff3 to compare 3 arbitrary…
Alex J.
  • 141
  • 3
3
votes
1 answer

Using WinMerge as ClearCase diff viewer for xml files

I just installed WinMerge and checked its "Integrate with ClearCase" option. ClearCase now runs Winmerge when i execute "compare with previous version" on my java source files. However, when I run the same command on an xml file, it opens xml diff…
zedoo
  • 10,562
  • 12
  • 44
  • 55
1 2
3
…
9 10