Git Extensions

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

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

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

• Open the Settings Menu (Tools → Settings)
• Switch to Config entry under Git
• Set the following parameters:
  • Difftool: Don't select anything but just write LemonTree or something similar
  • Path to difftool: C:\Program Files\LieberLieber\LemonTree\LemonTree.Starter.exe
  • Difftool command: "C:\Program Files\LieberLieber\LemonTree\LemonTree.Starter.exe" diff --base="$BASE" --mine="$LOCAL" --theirs="$REMOTE"

With this setup, Git Extensions will use LemonTree for all diffs, however you can still see changes in textfiles directly in Git Extensions. To see the changes in an eap(x) or qea(x) file, click on the diff the Diff section of the UI and press F3 or select any of these options via the context menu:

Utilization of LemonTree in Conjunction with other Diff Tools

Git Extensions 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

Git Extensions 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 Settings Menu (Tools → Settings)
• Switch to Config entry under Git
• Set the following parameters:
  • Merge Tool: Don't select anything but just write LemonTree or something similar
  • Path to mergetool: C:\Program Files\LieberLieber\LemonTree\LemonTree.Starter.exe
  • Mergetool command: "C:\Program Files\LieberLieber\LemonTree\LemonTree.Starter.exe" merge --theirs="$REMOTE" --mine="$LOCAL" --base="$BASE" --out="$MERGED"

Utilization of LemonTree in Conjunction with other Merge Tools

Git Extensions 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

Example Setup

If you set everything up correctly this is how the Git Config screen should look like:

And this is how the main settings screen should look like:

Git LFS Support

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

Git LFS