Create
cancel
Showing results for 
Search instead for 
Did you mean: 
Sign up Log in
Deleted user
0 / 0 points
Next:
badges earned

Your Points Tracker
Challenges
Leaderboard
  • Global
  • Feed

Badge for your thoughts?

You're enrolled in our new beta rewards program. Join our group to get the inside scoop and share your feedback.

Join group
Recognition
Give the gift of kudos
You have 0 kudos available to give
Who do you want to recognize?
Why do you want to recognize them?
Kudos
Great job appreciating your peers!
Check back soon to give more kudos.

Past Kudos Given
No kudos given
You haven't given any kudos yet. Share the love above and you'll see it here.

It's not the same without you

Join the community to find out what other Atlassian users are discussing, debating and creating.

Atlassian Community Hero Image Collage

Reset external diff/merge tool (KDiff3) path

I am trying to set up SourceTree to use KDiff3 for the external diff tool and external merge tool.

The first time you set the menus to KDiff3 and hit OK, a dialog appears requiring you to find the location of the KDiff3 executable.

I accidentally used the Start Menu shortcut instead of the actual file, but now I can't figure out how to change the path (the dialog doesn't appear once you've initially set it).

How can I change the file path of the KDiff3.exe?

1 answer

0 votes
minnsey Atlassian Team Feb 27, 2018

Hi

If you want to do it in Sourcetree, in the Tools/Options/Diff select a 'Custom' diff and merge tool and select a random .exe then OK the Tools/Options dialog. Then re-open and change it back to KDiff3. 

That should all have the effect of overwriting and then resetting the external diff/merge settings.

Alternatively use the git command line to clear difftool.sourcetree.cmd and mergetool.sourcetree.cmd using

>git config --global --unset difftool.sourcetree.cmd


etc

Then reset in Sourcetree

When you select "Custom" should it show a dialog? Also when you do set it to a different one, all the code in the fields is reset. SHould it show default code there?

I was trying to get Custom working again and decadently changed the first one. THen remembered i had same issue before and need google what code should be in those fields.

merge-diff-fields-reset-onchang.png.png

Where can i actually apply that command ?

git config --global --unset difftool.sourcetree.cmd

Suggest an answer

Log in or Sign up to answer
TAGS
Community showcase
Published in Sourcetree

Tip from the team: configure your repos for hosting goodness!

Supported Platforms macOS Windows We recently introduced support for additional hosting services such as GitHub Enterprise, GitLab (Cloud, Community Edition, Enterprise Edition), and...

3,255 views 4 5
Read article

Community Events

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

Find an event

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

Unfortunately there are no Community Events near you at the moment.

Host an event

You're one step closer to meeting fellow Atlassian users at your local event. Learn more about Community Events

Events near you