Stack Overflow
Stack Overflow

Questions tagged [diffmerge]

DiffMerge is an three-way merge tool by SourceGear that allows to visually compare and merge files on Windows, OS X and Linux.

DiffMerge is an free 3-way merge tool by SourceGear that runs on Windows, Mac, and Linux.

With the 3.3.0 release (April 2009), DiffMerge is compatible with Mercurial external merge feature. When the --result=file argument is used, DiffMerge writes the merge result to the given file and exits with 0 (merge resolved), 1 (merge aborted), or 2 (other error). Note that DiffMerge does not handle binary files so you'll want to configure another tool for them.

You can also use DiffMerge as an external diff viewer using the extdiff extension feature. With the changes below, you can type hg diffmerge instead of hg diff.

42 questions
0
votes
1 answer

Customize IBM DiffMerge to export a custom Report

I am using IBM DiffMerge to generate a Report that shows all differences between two .cls files or .sbs files. I was playing with it and I saw that there is a filed in option menu that allows you to change the format of the report, but it implies…
Daniel
  • 91
  • 1
  • 14
0
votes
1 answer

Where does diffmerge store its temp files

I recently started to work with IBM Rhapsody and I try to personalize it, but in order to do that I got to have a better understanding of DiffMerge. What I want to do is this: I have two diagrams, I load them in DiffMerge and it shows me a lot of…
Daniel
  • 91
  • 1
  • 14
0
votes
1 answer

How can I fine tune what Visual Studio considers a merge conflict when using TFS?

I am attempting to merge a small amount of code changes from a branched file to a trunk file that has been heavily modified (mostly by adding cases to a switch). When I am attempting to merge the code, I am merging from the older file to the newer…
DaDuStMaN20
  • 137
  • 2
  • 11
0
votes
1 answer

Eclipse error: The type org.eclipse.emf.edit.domain.EditingDomain cannot be resolved. It is indirectly referenced from required .class files

I've got an error message in Eclipse: The type org.eclipse.emf.edit.domain.EditingDomain cannot be resolved. It is indirectly referenced from required .class files I've got it when I tried to use the EMF DiffMerge plugin on my EMF model project. I…
szd
  • 1
  • 1
0
votes
1 answer

What is a better set of settings to use than text to compare xml files using Collaborator's DiffMerge?

Collaborator uses DiffMerge to compare files. It provides a means to add rulesets. There is nothing provided for XML files. I'd like to be able to compare without including the comments. I can get sections on the same line to behave with…
dfrevert
  • 366
  • 5
  • 17
0
votes
3 answers

How to see changes in subrepos between commits

I have a mercurial repo with subrepos (also mercurial). Imagine the situation where I have changed the subrepos and the main repo. Now I want to see the changes between several commits including the changes in the subrepos. Is it possible? I use…
synacker
  • 1,722
  • 13
  • 32
0
votes
1 answer

Accessing elements properties in a EMF Compare Diff Model

I have used EMF Compare to compare 2 models comforming to a custom metamodel. I generated and saved the Diff model to an .xmi file. Currently, I am working on how to use the Diff Model within ATL to transform the differences to another model. The…
user3488996
  • 1,339
  • 2
  • 10
  • 13
0
votes
1 answer

3-way merge (update) file based on differences in 2 branches

I have 3 text files: Branch A, version i (Ai) Branch A, version i-1 (Ai-1) Branch B, version i-1 (Bi-1) Is there any merge/diff tool to produce Branch B, version i (Bi) with the following rules: if Ai=Ai-1, then use Bi-1 in Bi if Ai<>Ai-1=Bi-1,…
denfromufa
  • 5,610
  • 13
  • 81
  • 138
0
votes
1 answer

Using Altova DiffDog as merge tool in Visual Studio 2012

I have searched for a way to use Altova DiffDog as the merge tool for config and other xml files in Visual Studio 2012, TFS. The information I'm after is what command line codes to use in the "Configure User Tools" dialog.
Shoobah
  • 697
  • 5
  • 7
0
votes
1 answer

AnkhSVN & DiffMerge Not Saving Changes

I'm using Ankh SVN 2.4.11610.27 for Visual Studio 2010 and it works decently enough. I've set up SourceGear DiffMerge to be able to resolve merge conflicts using the instructions provided here. I can now right-click a file in my solution explorer…
that_one_guy
  • 116
  • 7
0
votes
1 answer

Using Diffmerge with TortoiseSVN - how to deal with a single block of code (1000+ lines) that's marked as conflicted

I'm merging some changes from trunk back into a branch with TortoiseSVN. I did some whitespace modification (just tidying things up) and DiffMerge is showing a very large block of code (probably around 2000 lines) as conflicted. Some of it's just…
tjsimmons
  • 733
  • 4
  • 10
  • 21
-2
votes
1 answer

Using DiffMerge on CodeAnywhere and Git - "Not Found" Message

I have installed DiffMerge on my Mac and configured git to use it per their instructions and it works well. http://twobitlabs.com/2011/08/install-diffmerge-git-mac-os-x/#comment-140648 Hit return to start merge resolution tool…
G-Man
  • 1,138
  • 16
  • 20
1 2
3