Add new merge conflicts menu and move the previous external merge tool there#3477

recht wants to merge 1 commit intojesseduffield:masterjesseduffield/lazygit:masterfrom

recht:conflictsrecht/lazygit:conflictsCopy head branch name to clipboard