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
2
votes
4 answers

git with DiffMerge setup to mimic Mercurials setup with diffmerge

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 of cycling through them via the…
Bryan
  • 614
  • 1
  • 8
  • 18
2
votes
1 answer

Git configure difftool and mergetool by DiffMerge not working

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 use DiffMerge: C:\> git config --global…
masiboo
  • 4,537
  • 9
  • 75
  • 136
2
votes
1 answer

PhpStorm - advanced settings for diff viewer

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 lot of changed files which have only one…
MageLover
  • 23
  • 2
2
votes
0 answers

DiffMerge integration into Tower for GIT

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 installed on my Windows machine, but only WinMerge…
Dennis Dittmann
  • 107
  • 7
2
votes
2 answers

Why can't I configure an external difftool or mergetool for Git?

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 others say it's not necessary. git config --global…
Ag71191
  • 83
  • 1
  • 9
2
votes
0 answers

How to I get diffmerge running as the merge tool for git

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 my merge tool - $ git config --global…
Aidan Ewen
  • 13,049
  • 8
  • 63
  • 88
2
votes
1 answer

Setting git diff to use diffmerge

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 the following error out of DiffMerge (in the form…
amphibient
  • 29,770
  • 54
  • 146
  • 240
2
votes
1 answer

What is the cmd to setup sourcetree with diffmerge for 3-way merges?

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/install-diffmerge-git-mac-os-x/ But nothing as…
pulkitsinghal
  • 3,855
  • 13
  • 45
  • 84
1
vote
0 answers

"tool diffmerge requires a GUI" when trying to hg merge in Cygwin

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 error message was introduced in commit 090b1a665901,…
dimo414
  • 47,227
  • 18
  • 148
  • 244
1
vote
1 answer

How to start visual diff of working copy and last commit of a file from command line in mercurial TortoiseHg

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 commit. Little background: I`m trying to add a…
Rijin
  • 102
  • 10
1
vote
1 answer

How to configure the prompt for diffmerge

Currently I have this gitconfig: [diff] tool = diffmerge [difftool "diffmerge"] cmd = diffmerge \"$LOCAL\" \"$REMOTE\" [merge] tool = diffmerge [mergetool "diffmerge"] cmd = "diffmerge --merge --result=\"$MERGED\" \"$LOCAL\" \"$(if…
Sonne
  • 691
  • 1
  • 6
  • 20
1
vote
1 answer

mac osx, git mergetool, diffmerge, command not found

I installed DiffMerge in Applications folder. I can't get DiffMerge run on its own, nor when I use git mergetool My PATH variable:…
EyeQ Tech
  • 7,198
  • 18
  • 72
  • 126
1
vote
1 answer

Comparing two mach-o files

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 encoding format it seems.
Irshad Mohamed
  • 2,129
  • 1
  • 18
  • 19
0
votes
1 answer

Diffmerge is unable to find Sourcetree files trying to resolve conflicts

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 diffmerge has the correct filenames and paths, but I'm…
matthellstrom
  • 11
  • 3
0
votes
1 answer

Git difftool not working Windows 10 Git Bash

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/DiffMerge/sgdm.exe\"$LOCAL\" \"$REMOTE\" [merge] tool =…
an4s911
  • 411
  • 1
  • 6
  • 16
1
2
3