Hacker News new | ask | show | jobs
by ramchip 89 days ago
Looks like it's "Show Base" under the top-level "..." menu when working on a merge conflict

https://github.com/microsoft/vscode/issues/155277#issuecomme...