Commits

Breadcrumbs

History for

onmaster

User selector

All users

All time

Commit History

Commits on Sep 16, 2020

• Update to use TS 4.1 for building VS Code

  mjbvz

  committed
  50cc1d0

  Copy full SHA for 50cc1d0

Commits on Jun 12, 2020

• make merge-conflic serverless

  aeschli

  committed
  d78d88f

  Copy full SHA for d78d88f

Commits on Mar 27, 2020

• Remove delay (fixes #62652)

  chrmarti

  committed
  f124103

  Copy full SHA for f124103

Commits on Nov 27, 2019

• fix typo: consecutive-word duplications

  Show description for d75f909
  ryenus

  committed
  d75f909

  Copy full SHA for d75f909

Commits on Sep 20, 2019

• support merge code lens for vscode-userdata

  sandy081

  committed
  81ec777

  Copy full SHA for 81ec777

Commits on Jul 1, 2019

• Fix: Accept All Current/Incoming for multiple files (fixes #63621)

  chrmarti

  committed
  039a49a

  Copy full SHA for 039a49a

Commits on May 24, 2019

• Open the diff view in current editor, to the side or below.

  rebornix

  committed
  c3fe962

  Copy full SHA for c3fe962

• Open the new editor group below

  rebornix

  committed
  9394467

  Copy full SHA for 9394467

• Always compare change with context.

  rebornix

  committed
  9cd81dc

  Copy full SHA for 9cd81dc

• Support open diff in new editor group

  rebornix

  committed
  b917a03

  Copy full SHA for b917a03

Commits on May 23, 2019

• Show context for diff view of merge conflict and introduce compareAll.

  rebornix

  committed
  fa69b4e

  Copy full SHA for fa69b4e

Commits on Jan 23, 2019

• Remove pointless conjucntion in documentTracker

  

  alexet

  committed
  16d3d13

  Copy full SHA for 16d3d13

Commits on Jan 4, 2019

• Second pass converting for index based looping to for-of loops

  Show description for c109d31
  mjbvz

  committed
  c109d31

  Copy full SHA for c109d31

• Replace some common index based for loops with `for-of` loops

  Show description for b4964bc
  mjbvz

  committed
  b4964bc

  Copy full SHA for b4964bc

• Enable no-var-keyword tslint rule

  mjbvz

  committed
  5cc0086

  Copy full SHA for 5cc0086

Commits on Nov 30, 2018

• Fix last merge conflict warnings

  

  laphets

  authored and

  chrmarti

  committed
  2e339af

  Copy full SHA for 2e339af

Commits on Oct 2, 2018

• Remove duplicate blank lines at the start of some extension src files

  mjbvz

  committed
  92a9a07

  Copy full SHA for 92a9a07

• Remove use strict in extensions (part 2)

  Show description for ff95705
  mjbvz

  committed
  ff95705

  Copy full SHA for ff95705

• Merge branch 'master' into Issue-#45853-checked

  chrmarti

  authored
  977fc70

  Copy full SHA for 977fc70

Commits on Sep 17, 2018

• Use the fast variant of TextEditor.setDecorations

  alexdima

  committed
  a46554c

  Copy full SHA for a46554c

Commits on Sep 6, 2018

• Use const enums (to inline their values in JS)

  alexdima

  committed
  c36258d

  Copy full SHA for c36258d

Commits on Apr 15, 2018

• Automatically navigate to the next merge conflict upon resolving a merge conflict

  andrewtomai

  committed
  7c26e93

  Copy full SHA for 7c26e93

Commits on Feb 8, 2018

• Update extensions for TS 2.7

  Show description for 308c188
  mjbvz

  committed
  308c188

  Copy full SHA for 308c188

Commits on Jan 25, 2018

• Add support for Language Packs

  dbaeumer

  committed
  04594c8

  Copy full SHA for 04594c8

Commits on Jan 10, 2018

• Register content provider (again) (fixes #40557)

  chrmarti

  committed
  1f06479

  Copy full SHA for 1f06479

Commits on Jan 8, 2018

• Fix typo in MergeDecorator class name

  

  sergey-kintsel

  authored and

  chrmarti

  committed
  31baddd

  Copy full SHA for 31baddd

Commits on Nov 7, 2017

• Add additional no unused checks for merge-conflict extension

  mjbvz

  committed
  7ac8e49

  Copy full SHA for 7ac8e49

• tslint5 adoption - fix semicolon rule

  egamma

  committed
  b94569f

  Copy full SHA for b94569f

Commits on Nov 6, 2017

• Enable strict in a few more extensions

  mjbvz

  committed
  cd00b59

  Copy full SHA for cd00b59

Commits on Aug 30, 2017

• Only register for file: and untitled: (fixes #33133)

  chrmarti

  committed
  af9f708

  Copy full SHA for af9f708

Commits on Aug 9, 2017

• Spelling fixes

  Lixire

  committed
  20cf247

  Copy full SHA for 20cf247

Commits on Jun 29, 2017

• Use original scheme (fixes #29872)

  chrmarti

  committed
  8da3ea9

  Copy full SHA for 8da3ea9

Commits on Jun 28, 2017

• Import 'nls' in extensions entry point. Fixes #29098.

  michelkaporin

  committed
  ab3c945

  Copy full SHA for ab3c945

Commits on Jun 26, 2017

• Fix background decorations (fixes #28368)

  chrmarti

  committed
  d9d481a

  Copy full SHA for d9d481a

• Support GNU patch --merge results (fixes #28360)

  chrmarti

  committed
  f7f7d74

  Copy full SHA for f7f7d74