Show and resolve a commit's conflicts in the desktop diff - #15278

Show and resolve a commit's conflicts in the desktop diff#15278

mtsgrd wants to merge 2 commits into

mastergitbutlerapp/gitbutler:masterfrom

stateless-conflicts-desktopgitbutlerapp/gitbutler:stateless-conflicts-desktopCopy head branch name to clipboard