159
User
Recs.
Recs.
21
Updates
Last
Updated
Updated
Activity
13 Options
SpecsUpdate
PlatformsWindows; Mac; Linux
LicenseFree
Pros
Pro Detects minimal changes without having a common ancestor
After a merge sometimes you have conflicts. You can resolve them by using a merge tool. You can run git mergetool --tool-help
to get more details about what tools are supported.
You will get an output like the followinggit mergetool --tool=<tool>
may be set to one of the following:
p4merge
tortoisemerge
vimdiff
vimdiff2
vimdiff3
The following tools are valid, but not currently available:
araxis
bc
bc3
codecompare
deltawalker
diffmerge
diffuse
ecmerge
emerge
gvimdiff
gvimdiff2
gvimdiff3
kdiff3
meld
opendiff
tkdiff
winmerge
xxdiff
Some of the tools listed above only work in a windowed environment. If run in a terminal-only session, they will fail.
Know any positive aspects of this option?
Cons
Know any negative aspects of this option?
Recommendations
P4Merge
Recommended 5 years ago
Perforce - P4Merge features graphical three-way merging and side-by-side file comparison.
Pro
3 way merge support Pro
Cross-platform with a good Mac portCon
ProprietaryPro
Ability to ignore whitespacesPro
FreeCon
Can't diff long lines against each otherPro
Compare imagesCon
Directory comparison is not supported