It seems that when I use a tool (such as winmerge) to update my codebase... my Visual Studio Team System (VSTS) integration with Team Foundation Server (TFS) doesn't seem to pick it up. How do I know which files to check out and check back in? Is there something I am missing? Is this a feature that isn't part of VSTS & TFS? ...
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 differences". If I use WinMerge I can see that the files ARE different. Does anyone know why t...
When Mercurial is running under cygwin, it's a bit tricky to figure out how to spawn WinMerge to resolve merge conflicts. How can I do this? ...
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 file doesn't list it, and I fail to see where to specify a path. Looks like it searches in ...
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 merge, not folder), it seems that I can only overwrite the right with the left. Is it possi...
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 ...
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 Stackoverflow. I found the answer elsewhere, but I am asking/answering here. It's now a commu...
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 subversion folders from the comparision? Or is there another (free) diff-tool which is able to d...
I would like to use WinMerge as the default diff tool inside VS2008 from the solutions explorer in place of the "Compare..." context menu item. Is this possible? I'm looking for a quick replacement of the current bland diff tool an I just like WinMerge better. I'm not interested in going to the folder explorer and doing the comparison th...
Is there a way to use Winmerge inside of Git to do Diffs? Thanks ...
Is there a diff tool, that allows me to write regular expression to remove a line from difference. Like see the two lines: this.Visible = true; Visible = true; And can I write an expression such that if line difference is exactly this ignore the difference. Can you please be specific on how to do that? I give you one more example li...
Hi, 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 = C:\Program Files (x86)\WinMerge\WinMergeU.exe opts.winmerge = /e /x /ub /wl [merge-tools] win...
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 the Mergetool, but I can't seem to figure out what syntax I should use and why. There seem ...
I am trying to customize the mappings for vimdiff and make them similar to winmerge In a vertical 2 way split, I want to map alt-left <a-left> to move current diff to left side and alt-right <a-right> to move current diff to right side. For merging i can use :diffg and :diffp. But I need to know which split i am in so that i can use :d...
Hello, 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 1.1 pom.xml submodule-2.1 pom.xml submodule-2.2...
Possible Duplicate: use Winmerge inside of Git to file diff Configuration Win7 64-bit MSysGit WinMerge installed (default location) Although there are many similar questions here, I found no real answers catering for us Microsoft users. Which is the correct way to configure WinMerge as your diff tool with Git 1.7.1 onwards?...
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 file to generate language specific images in a website that uses lots of graphics for texts....
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 far. From what I understand of extdiff, it merely calls your cmd.winmerge program, and pas...
Hi folks 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 file? PS I am using WinMerge 2.12.4.0 ...
Hi, I'm using WinMerge to compare java files in folders (including subfolders). I would like to ignore comments when the comparison is done, but I don't know how to do it. At the file level I've found a switch in the option, so if I compare two files the comments are ignored. However if I compare the folders where those two files live W...