I use lazygit for that. But any diff tool you like will work.