vimdiff
git difftool -t vimdiff
Pro tip: use ```triple backticks around text``` to write in code fences