[magicalhippo]

> for base, yours and theirs

I really hate that relative terminology. Call them "working copy", "merging commit" and "common ancestor" or something similarly absolute. And give me the revision/commit id's for each, so it's crystal clear in case I want to check up manually.

Not a dig on the vscode extension, but 3-way diff tools in general.

[IshKebab]

Yeah I 100% agree. Especially as Git gets it backwards in some cases! It's not even consistent about the names. Sometime I see "current" and "incoming" which is not really any better.

> And give me the revision/commit id's for each

It could show the branch names! `change on master`, `change on myfeature` or whatever.

[Gehinnn]

The 3 way merge editor actually shows the branch name!