SourceTree

LemonTree is not set up automatically as a Diff/Merge Tool for EAP(x) files in SourceTree as it is with TortoiseSVN/TortoiseGit.

However, you can manually configure SourceTree to utilize LemonTree by following this guide.

Diff-Tool integration of LemonTree for *.eap(x) files

• Open the Options Menu (Tools → Options)
• Switch to the "Diff" Tab (Third Tab)
• Set the following parameters:
  • External Diff Tool: Custom
  • Diff Command: C:\Program Files\LieberLieber\LemonTree\LemonTree.Starter.exe
  • Parameters: diff --base=\"$BASE\" --mine=\"$LOCAL\" --theirs=\"$REMOTE\"

With this setup, SourceTree still shows Diffs of text files as normal. To see the changes in an eap(x) file, click on the little cog in the bottom right of the SourceTree UI and select "External Diff":

Utilization of LemonTree in Conjunction with other Diff Tools

SourceTree does not allow the selection of different Diff-Tools based on file extensions by default. This can be accomplished by setting up the LemonTree Starter instead, however.

For more details, please refer to this page: LemonTree.Starter

Conflict Solver integration of LemonTree for *.eap(x) files

SourceTree does not allow the selection of different Merge-Tools based on different extensions. As such, setting up LemonTree is a bit more complicated:

• Open the Options Menu (Tools → Options)
• Switch to the "Diff" Tab (Third Tab)
• Set the following parameters:
  • Merge Tool: Custom
  • Diff Command: C:\Program Files\LieberLieber\LemonTree\LemonTree.Starter.exe
  • Parameters: merge --theirs=\"$REMOTE\" --mine=\"$LOCAL\" --base=\"$BASE\" --out=\"$MERGED\"

Utilization of LemonTree in Conjunction with other Merge Tools

SourceTree does not allow the selection of different Merge-Tools based on file extensions by default. This can be accomplished by setting up the LemonTree Starter instead, however.

For more details, please refer to this page: LemonTree.Starter

Git LFS Support

If you want to use Git LFS and SourceTree, please refer to the following guide on how to configure the git repository for LFS and LemonTree:

Git LFS