11893d88ef
CodeLens should be one word
2020-04-03 13:46:00 -07:00
c69c1719bb
Add enumDescriptions for merge-conflict.diffViewPosition
...
Fixes #74500
2019-05-28 14:54:29 -07:00
c3fe962b89
Open the diff view in current editor, to the side or below.
2019-05-24 15:26:50 -07:00
9cd81dcb5b
Always compare change with context.
2019-05-24 14:43:44 -07:00
b917a0341d
Support open diff in new editor group
2019-05-24 11:29:30 -07:00
fa69b4e7d6
Show context for diff view of merge conflict and introduce compareAll.
2019-05-23 14:19:09 -07:00
977fc70d40
Merge branch 'master' into Issue-#45853-checked
2018-10-02 15:57:39 +02:00
47212be6f3
Settings sweep ( #54690 )
2018-07-30 12:35:43 +02:00
7c26e93b21
Automatically navigate to the next merge conflict upon resolving a merge conflict
2018-04-14 20:03:55 -04:00
b3a1b98d54
Edit pass on built-in extension descriptions ( #44875 )
2018-03-01 16:43:06 -08:00
264d0c2ec8
Name, description, icon for merge-conflict extension ( #43978 )
2018-02-26 09:48:34 +01:00
58c1273a04
Adds "Accept All Current" to command palette
2017-11-27 15:48:02 -08:00
005c78dbf0
Title case ( fixes #27569 )
2017-05-31 10:39:36 -07:00
61a8de29c3
Remove proposed api references, update configuration title localization.
2017-05-23 11:54:43 -07:00
8f4e1f532d
Update extension configuration options
2017-05-23 09:50:23 -07:00
83fd45c45d
Command titles and category localization support
2017-05-22 14:04:51 -07:00
61f16319ab
Initial merge of 'better-merge' extension into core extensions.
...
- 'better-merge' command and setting namespace replaced with 'merge-conflict'
- Configuration settings from extension replaced with single 'merge-conflicts.enabled' : boolean setting
2017-05-22 13:56:18 -07:00
Greg Van Liew
Matt Bierner
Peng Lyu
Christof Marti
Alex Dima
atomai
Joe Martella
Phil Price