Sourcetree Diff Tool Not Working

Using TortoiseDiff and TortoiseMerge in Atlassian SourceTree

Meld, P4Merge, and Beyond Compare are probably your best bets out of the 13 options considered. 'Free and open source' is the primary reason people pick Meld over the competition. This page is powered by a knowledgeable community that helps you make an informed decision.
SourceTree Atlassain SourceTree is becoming a popular git frontend for both OS X and Windows. To configure SourceTree to use UniMerge as a diff tool, you can simply switch the diff and merge tool to 'Other', and specify.

I’m using SourceTree along with TortoiseMerge/Diff, which is very easy and convenient diff/merge tool. But, because it isn’t that easy and convenient to install and configure both tools, I wrote this simple memo-post to have check-list for future reference in one place.

To configure SourceTree to use Merge for comparing files: Open the SourceTree Preferences dialog and choose the Diff tab. Select Araxis Merge as the Visual Diff Tool. To configure SourceTree to use Merge for merging files: Open the SourceTree Preferences dialog and choose the Diff tab. Select Araxis Merge as the Merge Tool. Since now we have used the command line tool to specify this as the global diff and merge tool, SourceTree will use P4Merge as the diff/merge tool. However, a word of caution, SourceTree does come shipped with its own embedded Git client. If that is the case, you will either need to configure the Git instance that comes embedded with SourceTree or use the global one. To check which one is SourceTree using, go here: Click Tools-Options-Git-System Git. Hope this helps.

Steps.

Get standalone version of TortoiseMerge/Diff (quite old, since it doesn’t ship standalone since version 1.6.7 of TortosieSVN, that is since July 2011). Links and details in this answer.
Unzip TortoiseIDiff.exe and TortoiseMerge.exe to any folder (c:Program Files (x86)AtlassianSourceTreeextras in my case).
In SourceTree open Tools > Options > Diff > External Diff / Merge. Select TortoiseMerge in both dropdown lists.
Hit OK and point SourceTree to your location of TortoiseIDiff.exe and TortoiseMerge.exe.

After that, you can select Resolve Conflicts > Launch External Merge Tool from context menu on each conflicted file in your local repository. This will open up TortoiseMerge, where you can easily deal with all the conflicts, you have. Once finished, simply close TortoiseMerge (you don’t even need to save changes, this will probably be done automatically) and after few seconds SourceTree should handle that gracefully.

The only problem is, that it automatically creates backup copy, even though proper option is unchecked.

There is an alternate solution to this problem, which uses KDiff3 instead of TortoiseDiff / TortoiseMerge.

Source of this article: Stack Overflow.

To add your supply request file, do the following:

Sourcetree Diff Tool Not Working

From your BitbucketStationSupplies in Bitbucket, click Source to open the source directory. Notice you only have one file, supplies.txt, in your directory.
- A. Source page: Click the link to open this page.
- B. Branch selection: Pick the branch you want to view.
- C. More options button: Click to open a menu with more options, such as 'Add file'.
- D. Source file area: View the directory of files in Bitbucket.
From the Source page, click the More options button in the top right corner and select Add file from the menu. The More options button only appears after you have added at least one file to the repository. A page for creating the new file opens, as shown in the following image.
- A. Branch with new file: Change if you want to add file to a different branch.
- B. New file area: Add content for your new file here.
Enter supplyrequest in the filename field.
Select HTML from the Syntax mode list. Gcc expert 24 lx mac software.
Add the following HTML code to the text area:
We are requesting additional supplies. Please send us the following:
space ice cream nerf darts telescope light shield
Nkjv bible text file. Click Commit. The Commit message field appears with the message: supplyrequest created online with Bitbucket.
Click Commit under the message field.

Sourcetree Merge Tool