Crash fixed when selecting a file with no base in the "Resolve merge conflicts" dialog. Closes #2463
Merge branch 'release/2.48' of github.com:gitextensions/gitextensions into release/2.48
Ensure the part param is not null. Closes #2470.
Merge branch 'release/2.48'