Sync: Keybindings conflict - Show two way diff #86019
Description
Issue Type: Bug
Testing #85941
I disabled keybindings sync, changed a keybinding on both machines (the other is Mac) and then reenabled keybindings sync.
The conflict is shown as a single large change over the entire file:
Comparing the changes shows that there is just a small diff:
VS Code version: Code - Insiders 1.41.0-insider (9785578, 2019-12-03T05:40:39.806Z)
OS version: Windows_NT x64 10.0.17134
System Info
| Item | Value |
|---|---|
| CPUs | Intel(R) Core(TM) i7-4770HQ CPU @ 2.20GHz (4 x 2195) |
| GPU Status | 2d_canvas: enabled flash_3d: enabled flash_stage3d: enabled flash_stage3d_baseline: enabled gpu_compositing: enabled metal: disabled_off multiple_raster_threads: enabled_on oop_rasterization: disabled_off protected_video_decode: unavailable_off rasterization: unavailable_off skia_renderer: disabled_off surface_control: disabled_off surface_synchronization: enabled_on video_decode: enabled viz_display_compositor: enabled_on viz_hit_test_surface_layer: disabled_off webgl: enabled webgl2: enabled |
| Load (avg) | undefined |
| Memory (System) | 8.00GB (2.97GB free) |
| Process Argv | |
| Screen Reader | yes |
| VM | 44% |
Extensions (29)
| Extension | Author (truncated) | Version |
|---|---|---|
| unique-lines | bib | 1.0.0 |
| ssh | chr | 0.0.4 |
| ghlink | dt | 1.2.0 |
| remotehub | eam | 0.5.0 |
| tsl-problem-matcher | eam | 0.1.0 |
| EditorConfig | Edi | 0.14.2 |
| tslint | eg2 | 1.0.44 |
| git-project-manager | fel | 1.7.1 |
| vscode-pull-request-github | Git | 0.13.0 |
| rest-client | hum | 0.23.0 |
| solidity | Jua | 0.0.64 |
| theme-karyfoundation-themes | kar | 18.2.1 |
| graphql-for-vscode | kum | 1.15.3 |
| vscode-docker | ms- | 0.9.0 |
| remote-containers | ms- | 0.87.0 |
| remote-ssh-edit-nightly | ms- | 2019.12.2400 |
| remote-ssh-nightly | ms- | 2019.12.2400 |
| remote-wsl | ms- | 0.41.1 |
| azure-account | ms- | 0.8.7 |
| azurecli | ms- | 0.4.6 |
| github-issues-prs | ms- | 0.9.2 |
| debugger-for-chrome | msj | 4.12.2 |
| vetur | oct | 0.22.6 |
| vscode-versionlens | pfl | 0.24.0 |
| vscode-yaml | red | 0.6.1 |
| vscode-workspacecontains-canary | rob | 0.0.2 |
| vscode-open-in-github | sys | 1.13.0 |
| ayu | tea | 0.18.0 |
| vscodeintellicode | Vis | 1.2.0 |
(1 theme extensions excluded)