External diff / merge not working

Hi,

I'm using windows and I can't get the exteranl diff / merge tool to work. I'm trying to use beyond compare. I've selected beyond compare as the external tool to use, and nothing happens when I launch an external merge / diff.

I then tried setting it manually - I chose custom and entereed these options:

DIFF:

Diff Command: "C:/Program Files (x86)/Beyond Compare 3/bcomp.exe"

Arguments: "$LOCAL" "$REMOTE"

MERGE:

Diff Command: "C:/Program Files (x86)/Beyond Compare 3/bcomp.exe"

"$LOCAL" "$REMOTE" "$BASE" "$MERGED"

These are the same as set in my git config (from git config -l). I can run "git mergetool" from the command line and this works, but nothing happens in source tree.

Thanks for any help

4 answers

This may or may not help you.  The following works for me in SourceTree (that is what you are using - right?):

FYI - I do not have any quotes around any input.  I configured it from the SourceTree tool - not from the git config:

External Diff Tool: "Custom"

Diff Command: C:\Program Files (x86)\Beyond Compare 3\BComp.exe

Arguments: $LOCAL $REMOTE

Hope that helps!

I am having the same problem (this used to work flawlessly). Losing external diff functionality is a major pain, please help...

I had the same issue with version 1.5.2.

It only occured when the remote file was deleted, so was not as bad as I thought.

I have reported the bug to Atlassian via Support.

A bug has been raised. https://jira.atlassian.com/browse/SRCTREEWIN-1666

I have the same issue.

sorce-tree-external-diff-cfg.png

Diff Command: C:\Data\Development\diffdoc.bat

Arguments: $LOCAL $BASE

=diffdoc.bat content is======================

@echo off ::"C:\Program Files\SoftInterface, Inc\WordDocDiff\WDD.EXE" /m"%1" /s"%2"

Set DiffDoc="C:\Program Files (x86)\Softinterface, Inc\DiffDoc\DiffDoc.exe"

%DiffDoc% /M"%1" /S"%2"

::%DiffDoc% /M"%1" /S"%2" ::/G /X  

=======================================

 

If I press 'External Diff' (or Cntrl+D) nothing happens but It works if I just do it in the CMD:

diffdoc.bat a.docx b.docx

It starts the diff tool and I can see difference in the documents....

It looks like a bug somewhere!

Suggest an answer

Log in or Sign up to answer
Atlassian Community Anniversary

Happy Anniversary, Atlassian Community!

This community is celebrating its one-year anniversary and Atlassian co-founder Mike Cannon-Brookes has all the feels.

Read more
Community showcase
Brian Ganninger
Published Jan 23, 2018 in Sourcetree

Tip from the team: workflow and keyboard shortcuts

Supported Platforms macOS Sourcetree has a lot to offer and, like many developer tools, finding and using it all can be a challenge, especially for a new user. Everyone might not love ...

665 views 0 4
Read article

Atlassian User Groups

Connect with like-minded Atlassian users at free events near you!

Find a group

Connect with like-minded Atlassian users at free events near you!

Find my local user group

Unfortunately there are no AUG chapters near you at the moment.

Start an AUG

You're one step closer to meeting fellow Atlassian users at your local meet up. Learn more about AUGs

Groups near you