Looks like it's "Show Base" under the top-level "..." menu when working on a mer...

		ramchip 15 days ago \| parent \| context \| favorite \| on: The future of version control 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...