Skip to content

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

Draft
mtsgrd wants to merge 2 commits into
masterfrom
stateless-conflicts-desktop
Draft

Show and resolve a commit's conflicts in the desktop diff#15278
mtsgrd wants to merge 2 commits into
masterfrom
stateless-conflicts-desktop