https://videosashka.com/watch/iZ4t9GpwUNQ/merge-diff-using-meld-in-git