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

How to compare 2 folders in winmerge, but ignore file extension?

I think the right regex, forgive my ignorance on this. I got some ideas from this useful stack question and the winmerge filter help page But I can't get it to work. Some help please, much appreciated. f: *\.insv(.mp4)?$ ## *.insv and *.mp4 files
Craig Lambie
  • 2,888
  • 2
  • 14
  • 17
2
votes
1 answer

Winmerge: Filter for file types and include subfolders

I have created a filter in winmerge so that it only compares the spesific file types. The filter look as follows: def: exclude f: \.xml$ f: \.csv$ f: \.rteparams$ f: \.rteswb$ f: \.rteudp$ f: \.rte$ f: \.cfg$ This works fine, but the compare does…
2
votes
1 answer

Git diff doesn't work within submodule

I'm on Windows 10, using Git command line and have WinMerge set up as my difftool. I have a repository with several submodules. When running "git diff" and "git difftool" within the main repo, it correctly uses WinMerge to analyze the files. When I…
develdevil
  • 297
  • 2
  • 15
2
votes
2 answers

git difftool suddenly stopped working / how to troubleshoot?

I have set up my git difftool to use winmerge. It has been working for quite a while. But it suddenly stopped working today. git difftool used to invoke winmerge on the dirty files one by one, but not today. The command just returned as if…
leeyuiwah
  • 6,562
  • 8
  • 41
  • 71
2
votes
1 answer

How to format a WinMerge fllter to ignore part of the line

I would like WinMerge to compare the full text but exclude a variable substring. Orientation="West" PhysicalAddress="2395226" DefFieldFrmt="Uf4d0" UnitCustomText="sec" Orientation="West" PhysicalAddress="2395230" DefFieldFrmt="Uf4d1"…
Derek
  • 23
  • 6
2
votes
1 answer

How to not copy ".svn" folders from left to right

I love WinMerge, and I can get it to not display SVN folders in the compare, however how can I configure it not to copy the ".svn" folders from left to right when I want to bring a folder from the left to the right without copying it file by…
Tom
  • 1,965
  • 3
  • 25
  • 33
2
votes
1 answer

GIT Diff with blame or source SHA

We feel we do a good job or reviewing each commit before merging in to master. However when we are ready for a new software release I often take one more review. I diff the last production release against the current production candidate. As I…
personalt
  • 810
  • 3
  • 13
  • 26
2
votes
1 answer

git difftool, winmerge with new files

I've seen the entries on only showing modified files etc. with difftool but has anyone found a way yet to also show the new files? I still want to see what someone added as part of the commit, even though it's a new file and not a modification. …
Papadeltasierra
  • 233
  • 1
  • 9
2
votes
2 answers

Cannot diff SVN temp files

I am attempting to diff two files in svn and see the side by side differences in winmerge as described in this post. However when I try to do that Winmerge opens but complains that the file paths are invalid. It appears that svn diff outputs files…
joe90p
  • 148
  • 6
2
votes
1 answer

Generated file with protobuf-net for c# is different a little from the same file generated in C++

I'm having a wired issue, I'm using protobuf-net for C# to generate a file which based on Google Protocol Buffer message and then upload it to one of my company's servers. I created a tool in C# that generates a .proto file to .cs, then I'm using…
Orionlk
  • 278
  • 2
  • 3
  • 17
1
vote
0 answers

How to get Winmerge to recognize that code can move around?

How to have Winmerge recognize similar code blocks instead of comparing line to line? Or is there a way to highlight and skip a region to compare to?
jdl
  • 6,151
  • 19
  • 83
  • 132
1
vote
0 answers

How to bookmark sets of files that we want to compare

I like really need to keep noticing differences between sets of 2 files . Is there a way I could accomplish this using winmerge or I should compose a script for winmerge?
Deck
  • 11
  • 2
1
vote
1 answer

WinMerge: How to compare folder names and file names only, recursively?

I currently have two main music folders, one is FLAC, ripped from CD, another is MP3, converted from FLAC. Over the years, my primary MP3 collection (in its own folder) has come from various sources, and has become a mess. I apparently messed up…
sushada
  • 11
  • 2
1
vote
1 answer

Compare multiple image side by side

I know there are quite some good image comparing tools, Beyond Compare can compare two images, WinMerge can compare up to three images, FastStone Image Viewer and XnViewMP can compare up to four images side by side. But, if I got more than four…
Jindi Li
  • 55
  • 2
  • 9
1
vote
4 answers

Using WinMerge with Bazaar

I searched a lot, found that some people claimed they did that, but I can't make it to work. How to you use WinMerge, my favorite diff tool on Windows, with Bazaar? I know difftools plugin (shipped with Bazaar) handles this but the controller.py…
PhiLho
  • 40,535
  • 6
  • 96
  • 134