Tools

Diff and Merge tools

When GitForce starts, it tries to detect diff and merge utilities for its use. It is recommended to have one of these installed before running the application.

You can always set a diff and merge tools later from within the Settings menu.

These are a few common diff and merge utilities that GitForce inherently knows about:

Windows OS:

Perforce Merge Tool         https://www.perforce.com/products/helix-core-apps/merge-diff-tool-p4merge

WinMerge                               https://winmerge.org

Beyond Compare 3 or 4       http://www.scootersoftware.com

KDiff3                                       http://kdiff3.sourceforge.net

Meld                                          https://meldmerge.org

Linux OS:

KDiff3                                       http://kdiff3.sourceforge.net

TKDiff                                       https://sourceforge.net/projects/tkdiff

Meld                                         http://meld.sourceforge.net/index.html

Xxdiff                                      http://furius.ca/xxdiff

Diffuse                                    https://sourceforge.net/projects/diffuse

On a Linux OS, installing some of these utilities is as simple as typing “sudo apt-get install <name>” where <name> is a specific diff or merge utility.