Add merge menu with conflict resolver#4889

stefanhaller merged 1 commit intojesseduffield:masterjesseduffield/lazygit:masterfrom

lmnek:merge-file-optionslmnek/lazygit:merge-file-optionsCopy head branch name to clipboard