In this video, we will learn how to setup a git difftool and a git mergetool. These tools provide a nice GUI interface for viewing and modifying diffs and merges.
The tool we will be using in this tutorial is called DiffMerge:
https://sourcegear.com/diffmerge/
If you struggle reading or comparing diffs and merges within your terminal, then a good GUI tool can definitely make your life easier.