git: Save buffer when resolving a conflict from the project diff (#30762)

Closes #30555

Release Notes:

- Changed the project diff to autosave the targeted buffer after
resolving a merge conflict.
9041f734fdCole Miller committed on 5/19/2025, 5:32:31 PM· committed by GitHubparent844c7ad
2 files changedLine totals unavailable