The diffmerge tag has no wiki summary.
0
votes
1answer
7 views
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
...
0
votes
0answers
17 views
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 ...
0
votes
0answers
18 views
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 ...
0
votes
3answers
504 views
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:
...
1
vote
1answer
85 views
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 = ...
3
votes
1answer
224 views
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 = ...
1
vote
1answer
441 views
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:
...
1
vote
1answer
809 views
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]
...
0
votes
1answer
152 views
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 ...
0
votes
1answer
41 views
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 ...
2
votes
1answer
410 views
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 like:
#!/bin/bash
...
2
votes
4answers
213 views
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 ...
3
votes
1answer
1k views
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 ...
8
votes
1answer
2k views
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 ...
4
votes
1answer
700 views
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 merge?
.hgrc
[ui]
merge=diffmerge
[extensions]
...
