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
819
votes
26 answers

How do I view 'git diff' output with my preferred diff tool/ viewer?

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
  • 9,101
  • 4
  • 24
  • 18
21
votes
4 answers

How do I setup DiffMerge with msysgit / gitk?

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 trying to put together a wrapper script that I can…
avggeek
  • 375
  • 1
  • 2
  • 8
12
votes
6 answers

Git difftool not launching external DiffMerge program

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 variable and put my git-diff-diffmerge-wrapper.sh file…
EmmyS
  • 11,892
  • 48
  • 101
  • 156
12
votes
6 answers

How to get DiffMerge configured to work with Git on Windows 7 or Windows 2012?

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: [diff] tool = DiffMerge [difftool…
David Hoerster
  • 28,421
  • 8
  • 67
  • 102
11
votes
4 answers

How to set up SourceGear DiffMerge as the diff/merge tool for Visual Studio?

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 Foundation Server -> Configure User Tools dialog, but…
Shaul Behr
  • 36,951
  • 69
  • 249
  • 387
10
votes
1 answer

Using git with diffmerge with no prompts and no alias

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 = difftool --no-prompt If I just use git difftool it…
Newtang
  • 6,414
  • 10
  • 49
  • 70
8
votes
1 answer

Problem with git + DiffMerge on OS X

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 \"\$LOCAL\" \"\$REMOTE\"" git config --global…
theycallmemorty
  • 12,515
  • 14
  • 51
  • 71
6
votes
3 answers

Sourcetree fails to open Diffmerge for merge conflicts

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 Merge Tool' sourcetree opens its waiting view…
Saren Inden
  • 3,450
  • 4
  • 32
  • 45
5
votes
1 answer

Problem for open DiffMerge SnailSVN in Mojave

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 is: Unable to install difftool.sh to the scripts…
Rafael Monteiro
  • 51
  • 1
  • 2
5
votes
1 answer

How do I make diffmerge do a three-way merge with Mercurial?

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…
Casebash
  • 114,675
  • 90
  • 247
  • 350
4
votes
4 answers

Need help configuring external diff with Eclipse

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 noticed I was getting (what I think is) a…
ryan
  • 2,311
  • 3
  • 22
  • 28
3
votes
1 answer

using DiffMerge

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/Subversion menu. Trouble is, I don't have a…
ekkis
  • 9,804
  • 13
  • 55
  • 105
3
votes
1 answer

set rhapsody DiffMerge as svn merge-tool

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've set: #!/bin/bash …
boczuleq
  • 31
  • 1
3
votes
1 answer

Setting diffmerge as visual Git difftool not working

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] tool = diffmerge [difftool "diffmerge"] cmd…
Nick
  • 6,366
  • 5
  • 43
  • 62
2
votes
2 answers

Getting exit code 255 when trying to launch diffmerge from svn

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…
Mihai Fonoage
  • 478
  • 2
  • 8
  • 23
1
2 3