#remerge-diff
Conflict Resolution Diff
kaisumi
View Git conflict resolution diffs from Visual Studio Code.
Visualization
#git
5
Merge Resolution Diff
andy-orbis
Review only the manual part of a merge commit (conflict resolutions) as native split diffs: committed result vs git's mechanical auto-merge (remerge-diff semantics).
SCM Providers
#git
3