maxmustermann/vscode
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
vscode/extensions/merge-conflict
History
Peng Lyu c3fe962b89 Open the diff view in current editor, to the side or below.
2019-05-24 15:26:50 -07:00
..
resources/icons
src Open the diff view in current editor, to the side or below. 2019-05-24 15:26:50 -07:00
.vscodeignore
extension.webpack.config.js
package.json Open the diff view in current editor, to the side or below. 2019-05-24 15:26:50 -07:00
package.nls.json Open the diff view in current editor, to the side or below. 2019-05-24 15:26:50 -07:00
README.md
tsconfig.json
yarn.lock

README.md

Merge Conflict

Notice: This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.

Features

See Merge Conflicts in VS Code to learn about features of this extension.