Skip to main content
Stack Overflow for Teams is now Stack Internal: See how we’re powering the human intelligence layer of enterprise AI. Read more >
43 questions
Newest Active Bountied Unanswered
Filter by
Sorted by
Tagged with
0 votes
0 answers
51 views

I am comparing two folders, one I pulled down from GitHub and one that I've been working on locally and would like to push. DiffMerge displayed the files as different, as expected, so I went in and ...
phil-daniels's user avatar
  • 654
0 votes
1 answer
171 views

I have a new mac mini, M1 chip. When I try to resolve conflicts using diffmerge in sourcetree, diffmerge can't find the created temp files. Sourcetree creates the files, they're out there and ...
matthellstrom's user avatar
  • 11
0 votes
1 answer
966 views

I installed diffmerge and pasted this into my .gitconfig file in my C:/Users folder. [diff] tool = diffmerge [difftool "diffmerge"] cmd = C:/Program\\ Files/SourceGear/Common/...
an4s911's user avatar
  • 430
7 votes
3 answers
10k views

Recently I had a fresh install of macOS. I've installed Sourctree and diffmerge and set diffmerge as the default merge tool. For some reason everytime when I select 'Resolve Conflicts -> Open External ...
Saren Inden's user avatar
  • 3,660
5 votes
1 answer
4k views

The first message dialog error is: Difftool would like to access “~/Library/Application/Scripts/net.langui.SnailSVN.DiffTool And after clicking on the button 'Authorize', the second message dialog ...
Rafael Monteiro's user avatar
  • 51
0 votes
1 answer
237 views

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 ...
Daniel's user avatar
  • 103
0 votes
1 answer
91 views

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 ...
Daniel's user avatar
  • 103
0 votes
1 answer
106 views

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,...
DaDuStMaN20's user avatar
  • 147
2 votes
1 answer
1k views

I'm trying to configure DiffMerge for git to use for difftool and mergetool. I used following command:- The following commands in a Command Prompt window will update your .gitconfig to configure GIT ...
masiboo's user avatar
  • 4,729
2 votes
1 answer
402 views

Does anyone know if it's possible to configure diff viewer in PhpStorm and specify what changes to ignore? For example, I have updated Magento installation to a newer version. This version contains a ...
MageLover's user avatar
  • 23
2 votes
0 answers
516 views

By chosing File -> Preferences -> Git Config -> Diff tool / Merge tool you can adjust your favourite diff/merge tool when using Tower for GIT (https://www.git-tower.com/) DiffMerge and WinMerge are ...
Dennis Dittmann's user avatar
  • 117
0 votes
1 answer
754 views

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 ...
szd's user avatar
  • 1
2 votes
2 answers
1k views

I'm trying to configure an external difftool and mergetool for Git under Windows 10. Everything keeps telling me to type out two Git commands like the ones below. Some say to use a wrapper.sh while ...
Ag71191's user avatar
  • 93
1 vote
0 answers
276 views

I'm trying to run hg merge on Cygwin, which I've setup to launch DiffMerge on conflicts. Despite this, I get dropped into vimdiff when I merge. $ hg merge tool diffmerge requires a GUI ... This ...
dimo414's user avatar
  • 49.3k
0 votes
1 answer
49 views

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 ...
dfrevert's user avatar
  • 366
-2 votes
1 answer
1k views

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 ...
G-Man's user avatar
  • 1,495
0 votes
3 answers
565 views

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 ...
synacker's user avatar
  • 1,782
3 votes
1 answer
864 views

I'm trying to set rhapsody DiffMerge as merge tool in SVN. in I've set .subversion/config: [helpers] merge-tool-cmd = /opt/rhapsody/i386/7.5.2.1/DiffMerge "$2" "$3" "$1" in Rhapsody/DiffMerge i'...
boczuleq's user avatar
  • 31
13 votes
6 answers
24k views

I've been following the directions in the "blog entry by Dave" link in this answer as I'm on Windows 7 and do use SourceGear's DiffMerge tool. I've added the git\cmd directory to my PATH system ...
EmmyS's user avatar
  • 12.2k
0 votes
1 answer
196 views

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 ...
user3488996's user avatar
  • 1,389
0 votes
1 answer
52 views

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=...
den.run.ai's user avatar
  • 5,973
2 votes
0 answers
1k views

I'm running osx 10.9 with git and I'm trying to get diffmerge running as my merge tool. I've installed diffmerge and can launch it from my bash shell - $ diffmerge however when I try and set it up as ...
Aidan Ewen's user avatar
  • 13.4k
2 votes
1 answer
1k views

I wanted to set my git to use diffmerge as the default diff editor instead of the default Unix diff: git config --global diff.external diffmerge Undfortunately, when I did git diff myfile.txt I got ...
amphibient's user avatar
  • 31.7k
1 vote
1 answer
429 views

Provided that I already know that a file has been modified in a mercurial repo, Is there any way to start a diff tool in command line to show the visual diff of the file between working copy and ...
Rijin's user avatar
  • 102
11 votes
4 answers
10k views

I am using TFS for source control, but I want to use SourceGear DiffMerge for viewing file differences and doing merges. I found the Tools -> Options -> Source Control -> Visual Studio Team ...
Shaul Behr's user avatar
  • 38.2k
2 votes
1 answer
2k views

While browsing I found some hints on how to invoke a 3-way merge for diffmerge: https://answers.atlassian.com/questions/156961/setting-up-custom-merge-tool-in-sourcetree http://twobitlabs.com/2011/08/...
pulkitsinghal's user avatar
  • 4,144
0 votes
1 answer
204 views

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 "...
Shoobah's user avatar
  • 697
0 votes
1 answer
602 views

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 ...
that_one_guy's user avatar
  • 136
12 votes
6 answers
11k views

So I've seen a few questions about getting DiffMerge to be the mergetool and difftool for git. Essentially it comes down to having DiffMerge (sgdm.exe) in your PATH and a .gitconfig that looks like: ...
David Hoerster's user avatar
  • 28.8k
1 vote
1 answer
325 views

Currently I have this gitconfig: [diff] tool = diffmerge [difftool "diffmerge"] cmd = diffmerge \"$LOCAL\" \"$REMOTE\" [merge] tool = diffmerge [mergetool "diffmerge"] cmd = "...
Sonne's user avatar
  • 701
10 votes
1 answer
4k views

On OSX, I'm using diffmerge as my git diffing tool. Here is my .gitconfig: [diff] tool = diffmerge [difftool "diffmerge"] cmd = diffmerge \"$LOCAL\" \"$REMOTE\" [alias] d = ...
Newtang's user avatar
  • 6,594
1 vote
1 answer
2k views

I installed DiffMerge in Applications folder. I can't get DiffMerge run on its own, nor when I use git mergetool My PATH variable: /Applications/DiffMerge.app:/Applications/:/Applications/:/usr/bin:...
EyeQ Tech's user avatar
  • 7,408
3 votes
1 answer
4k views

I am trying to configure DiffMerge as my difftool in Git but having no luck. This is the revelent section of my .gitconfig file (the other settings not shown are just for the user). [diff] ...
Nick's user avatar
  • 6,648
0 votes
1 answer
438 views

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 ...
tjsimmons's user avatar
  • 743
1 vote
1 answer
671 views

I have two mach-o files and i need to find the difference(hexadecimal differed values) in them. is there any tool available for doing this. i tried using "DiffMerge" but it doesn't have the supported ...
Mohamed Irshad's user avatar
  • 2,206
2 votes
2 answers
2k views

I'm trying to integrate DiffMerge with svn (version 1.6.16) on snow leopard, following the steps provided here. I made the following changes: 1) Created a script that looks like: #!/bin/bash ...
Mihai Fonoage's user avatar
  • 478
2 votes
4 answers
325 views

I'm wondering if there is a way to setup git and diffmerge so that when you execute the following command: git difftool diffmerge pops up and shows you a file listing of all the modified files instead ...
Bryan's user avatar
  • 624
3 votes
1 answer
2k views

I would like to be able to edit conflicts using DiffMerge but when I try, VS (2010) complains I need to configure an external tool. It states I should do this from the Tools/Options/Source Control/...
ekkis's user avatar
  • 10.3k
8 votes
1 answer
3k views

I have configured Sourcegear DiffMerge to be my default git merge tool using the following instructions: git config --global diff.tool diffmerge git config --global difftool.diffmerge.cmd "diffmerge \...
theycallmemorty's user avatar
  • 13k
5 votes
1 answer
1k views

I am currently using the commmand hg diffmerge -r 32 -r 30 myfile, but this only displays two windows, not three. How can I make it do a three way merge? .hgrc [ui] merge=diffmerge [extensions] ...
Casebash's user avatar
  • 120k
4 votes
4 answers
5k views

I am trying to set up my dev environment and I got SVN running with Eclipse on my mac (with Subclipse). However, when I click on a file I've changed and go to Compare With -> Latest From Repository, I ...
ryan's user avatar
  • 2,331
21 votes
4 answers
16k views

I've just started using Git and it's possible I've missed something obvious, but here goes: I'm using msysgit 1.6.2.2 on Windows XP While installing, I picked option 1 to "Use Git Bash only" I'm ...
avggeek's user avatar
  • 375
838 votes
26 answers
554k views

When I type git diff, I want to view the output with my visual diff tool of choice (SourceGear "diffmerge" on Windows). How do I configure git to do this?
user3891's user avatar
  • 9,301