I like p4merge. It's the UI from perforce, but it's free and you can use it with Git easily. Most 3-way merge tools will show you: yours, theirs, base, and th

I like p4merge. It's the UI from perforce, but it's free and you can use it with Git easily. Most 3-way merge tools will show you: yours, theirs, base, and the final result. https://www.perforce.com/downloads/visual-merge-tool https://www.perforce.com/downloads/visual-merge-tool Example: https://www.perforce.com/sites/default/files/image/2017-06/screenshot-p4v-horiz-tab-2.jpg https://www.perforce.com/sites/default/files/image/2017-06/s...